Changeset 4971f63 in flex_extract.git for source/python/submit.py

Timestamp:

Sep 27, 2018, 12:31:47 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

82b624a

Parents:

25b14be

Message:

eliminated some redundancy and exchanged CONTROL2 with the config-filename

File:

• source/python/submit.py (modified) (2 diffs)

source/python/submit.py

@@ -77 +77 @@
 
     args = get_cmdline_arguments()
-
-    try:
-        c = ControlFile(args.controlfile)
-    except IOError:
-        print('Could not read CONTROL file "' + args.controlfile + '"')
-        print('Either it does not exist or its syntax is wrong.')
-        print('Try "' + sys.argv[0].split('/')[-1] + \
-              ' -h" to print usage information')
-        sys.exit(1)
+    c = ControlFile(args.controlfile)
 
     env_parameter = read_ecenv(_config.PATH_ECMWF_ENV)
@@ -95 +87 @@
     # on ECMWF server this would also be the local side
     called_from_dir = os.getcwd()
-    if args.queue is None:
+    if not args.queue:
         if c.inputdir[0] != '/':
             c.inputdir = os.path.join(called_from_dir, c.inputdir)