Skip to content

Commit e6f72a0

Browse files
committed
update version number
1 parent f022c34 commit e6f72a0

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

funk

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Funk: (F)ind (U)r (N)odes on G5(K)
55
# Created by L. Pouilloux and M. Imbert (INRIA, 2012-2014)
66
#
7-
# Developped by the Hemera initiative, 2013-2014
7+
# Developped by the Hemera initiative, 2013-2015
88
# https://www.grid5000.fr/mediawiki/index.php/Funk
99
#
1010
import re
@@ -24,7 +24,7 @@ from execo_g5k.oar import get_oarsub_commandline, oarsub, format_oar_date, \
2424
format_oar_duration
2525
from execo.time_utils import timedelta_to_seconds, format_date
2626

27-
__version__ = '1.4'
27+
__version__ = '1.4.3'
2828

2929

3030
def main(args=None):
@@ -219,7 +219,7 @@ def set_loglevel(verbose, quiet, json):
219219

220220

221221
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 ' +
223223
__version__ + ' --'))
224224
logger.detail('Options\n%s', '\n'.join([style.emph(option.ljust(20)) +
225225
'= ' + str(value).ljust(10)
@@ -409,6 +409,8 @@ def get_reservation_cmd(jobs_specs, startdate, walltime, submission_opts,
409409
get_oarsub_commandline(sub) + '\n'
410410
cmd = cmd[0:-1]
411411
else:
412+
if program:
413+
submission_opts += " -p " + program
412414
cmd = get_oargridsub_commandline(jobs_specs,
413415
walltime=walltime,
414416
additional_options=submission_opts,
@@ -439,6 +441,8 @@ def make_reservation(args, jobs_specs, startdate):
439441
'reservation on site %s',
440442
style.emph(job[1]))
441443
else:
444+
if args.program:
445+
args.submission_opts += " -p " + args.program
442446
(job_id, _) = oargridsub(jobs_specs,
443447
walltime=args.walltime,
444448
additional_options=args.submission_opts,

0 commit comments

Comments
 (0)