4
4
# Funk: (F)ind (U)r (N)odes on G5(K)
5
5
# Created by L. Pouilloux and M. Imbert (INRIA, 2012-2014)
6
6
#
7
- # Developped by the Hemera initiative, 2013-2014
7
+ # Developped by the Hemera initiative, 2013-2015
8
8
# https://www.grid5000.fr/mediawiki/index.php/Funk
9
9
#
10
10
import re
@@ -24,7 +24,7 @@ from execo_g5k.oar import get_oarsub_commandline, oarsub, format_oar_date, \
24
24
format_oar_duration
25
25
from execo .time_utils import timedelta_to_seconds , format_date
26
26
27
- __version__ = '1.4'
27
+ __version__ = '1.4.3 '
28
28
29
29
30
30
def main (args = None ):
@@ -219,7 +219,7 @@ def set_loglevel(verbose, quiet, json):
219
219
220
220
221
221
def welcome (args ):
222
- logger .info ('%s' , style .log_header ('-- Find yoUr Nodes on g5K ' +
222
+ logger .info ('%s' , style .log_header ('-- Find yoUr Nodes on g5K ' +
223
223
__version__ + ' --' ))
224
224
logger .detail ('Options\n %s' , '\n ' .join ([style .emph (option .ljust (20 )) +
225
225
'= ' + str (value ).ljust (10 )
@@ -409,6 +409,8 @@ def get_reservation_cmd(jobs_specs, startdate, walltime, submission_opts,
409
409
get_oarsub_commandline (sub ) + '\n '
410
410
cmd = cmd [0 :- 1 ]
411
411
else :
412
+ if program :
413
+ submission_opts += " -p " + program
412
414
cmd = get_oargridsub_commandline (jobs_specs ,
413
415
walltime = walltime ,
414
416
additional_options = submission_opts ,
@@ -439,6 +441,8 @@ def make_reservation(args, jobs_specs, startdate):
439
441
'reservation on site %s' ,
440
442
style .emph (job [1 ]))
441
443
else :
444
+ if args .program :
445
+ args .submission_opts += " -p " + args .program
442
446
(job_id , _ ) = oargridsub (jobs_specs ,
443
447
walltime = args .walltime ,
444
448
additional_options = args .submission_opts ,
0 commit comments