3706: Catch and return exceptions in _populate_* methods to dry up _populate()

[arvados.git] / crunch_scripts / run-command

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index f46148e075fcec85544c057db186760bfd15fd9b..c1e747506091863a11b028656b662e50f484ef5b 100755 (executable)
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -31,7 +31,7 @@ import tempfile
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--dry-run', action='store_true')
-parser.add_argument('--job-parameters', type=str, default="{}")
+parser.add_argument('--script-parameters', type=str, default="{}")
 args = parser.parse_args()
 
 os.umask(0077)
@@ -96,7 +96,7 @@ class SigHandler(object):
         self.sig = signum
 
 def add_to_group(gr, match):
-    m = ('^_^').join(match.groups())
+    m = match.groups()
     if m not in gr:
         gr[m] = []
     gr[m].append(match.group(0))
@@ -127,17 +127,17 @@ def expand_item(p, c):
                 items = get_items(p, p[c["group"]])
                 groups = {}
                 for i in items:
-                    p = pattern.match(i)
-                    if p:
-                        add_to_group(groups, p)
+                    match = pattern.match(i)
+                    if match:
+                        add_to_group(groups, match)
                 return [groups[k] for k in groups]
             elif "extract" in c:
                 items = get_items(p, p[c["extract"]])
                 r = []
                 for i in items:
-                    p = pattern.match(i)
-                    if p:
-                        r.append(list(p.groups()))
+                    match = pattern.match(i)
+                    if match:
+                        r.append(list(match.groups()))
                 return r
     elif isinstance(c, list):
         return expand_list(p, c)