[ARVADOS] created: 1.3.0-2714-g426e66b37

[Git user]

        at  426e66b37ecfa31ca580eeefb95aa4f0ccda809d (commit)


commit 426e66b37ecfa31ca580eeefb95aa4f0ccda809d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Jun 24 16:29:42 2020 -0400

    16382: When packing workflow convert "path" to "location"
    
    Previously it was being modified in-place and the modification was
    propagated to the packed version, that no longer happens so it needs
    to re-apply the path->location fix here.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 7bb66a158..ea4ecf2b6 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -437,6 +437,9 @@ def packed_workflow(arvrunner, tool, merged_map):
                 if "id" not in v:
                     raise SourceLine(v, None, Exception).makeError("Embedded process object is missing required 'id' field")
                 cur_id = rewrite_to_orig.get(v["id"], v["id"])
+            if "path" in v and "location" not in v:
+                v["location"] = v["path"]
+                del v["path"]
             if "location" in v and not v["location"].startswith("keep:"):
                 v["location"] = merged_map[cur_id].resolved[v["location"]]
             if "location" in v and v["location"] in merged_map[cur_id].secondaryFiles:

-----------------------------------------------------------------------


hooks/post-receive
--