File tree Expand file tree Collapse file tree 1 file changed +14
-8
lines changed Expand file tree Collapse file tree 1 file changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -469,14 +469,22 @@ def makeRelative(u):
469
469
470
470
stdout .write (json .dumps (deps , indent = 4 ))
471
471
472
+ def versionstring ():
473
+ pkg = pkg_resources .require ("cwltool" )
474
+ if pkg :
475
+ return "%s %s" % (sys .argv [0 ], pkg [0 ].version )
476
+ else :
477
+ return "%s %s" % (sys .argv [0 ], "unknown version" )
478
+
472
479
def main (args = None ,
473
480
executor = single_job_executor ,
474
481
makeTool = workflow .defaultMakeTool ,
475
482
selectResources = None ,
476
483
parser = None ,
477
484
stdin = sys .stdin ,
478
485
stdout = sys .stdout ,
479
- stderr = sys .stderr ):
486
+ stderr = sys .stderr ,
487
+ versionfunc = versionstring ):
480
488
481
489
_logger .removeHandler (defaultStreamHandler )
482
490
_logger .addHandler (logging .StreamHandler (stderr ))
@@ -494,13 +502,11 @@ def main(args=None,
494
502
if args .debug :
495
503
_logger .setLevel (logging .DEBUG )
496
504
497
- pkg = pkg_resources .require ("cwltool" )
498
- if pkg :
499
- if args .version :
500
- print "%s %s" % (sys .argv [0 ], pkg [0 ].version )
501
- return 0
502
- else :
503
- _logger .info ("%s %s" , sys .argv [0 ], pkg [0 ].version )
505
+ if args .version :
506
+ print versionfunc ()
507
+ return 0
508
+ else :
509
+ _logger .info (versionfunc ())
504
510
505
511
if not args .workflow :
506
512
parser .print_help ()
You can’t perform that action at this time.
0 commit comments