X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/53c6f7b15cf655127058c36e38396889d63af92f..ef56ac56a0bac0710a486c0e5e9cdd3199eddc61:/crunch_scripts/run-command

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index 837e267b21..c1e7475060 100755
--- 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)
@@ -56,8 +56,9 @@ else:
     jobp = json.loads(args.job_parameters)
     os.environ['JOB_UUID'] = 'zzzzz-8i9sb-1234567890abcde'
     os.environ['TASK_UUID'] = 'zzzzz-ot0gb-1234567890abcde'
-    os.environ['CRUNCH_SRC'] = '/tmp/crunch-src'
-    os.environ['TASK_KEEPMOUNT'] = '/keep'
+    os.environ['CRUNCH_SRC'] = '/tmp/crunche-src'
+    if 'TASK_KEEPMOUNT' not in os.environ:
+        os.environ['TASK_KEEPMOUNT'] = '/keep'
 
 links = []
 
@@ -95,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))
@@ -126,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)