Merge branch 'bf/wait' into 'master'

Bf/wait

See merge request fsl/fslpy!210

CHANGELOG.rst

@@ -58,7 +58,8 @@ Fixed
 * Updated the :func:`.prepareArgs` function to use ``shlex.split`` when
   preparing shell command arguments, instead of performing a naive whitespace
   split.
-* Fixed some bugs in the :func:`.fslsub.info` function.
+* Fixed some bugs in the :func:`.fslsub.info` and :func:`.fslinfo.wait`
+  functions.
 
 
 2.8.4 (Monday 2nd March 2020)

fsl/utils/fslsub.py

@@ -160,8 +160,9 @@ def info(job_id):
         return {}
     res = {}
     for line in result.splitlines()[1:]:
-        key, value = line.split(':', 1)
-        res[key.strip()] = value.strip()
+        kv = line.split(':', 1)
+        if len(kv) == 2:
+            res[kv[0].strip()] = kv[1].strip()
     return res
 
 
@@ -208,7 +209,7 @@ def wait(job_ids):
                   before continuing
     """
     start_time = time.time()
-    for job_id in _flatten_job_ids(job_ids):
+    for job_id in _flatten_job_ids(job_ids).split(','):
         log.debug('Waiting for job {}'.format(job_id))
         while len(info(job_id)) > 0:
             wait_time = min(max(1, (time.time() - start_time) / 3.), 20)