From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 27 Sep 2016 17:42:04 +0000 (-0400)
Subject: Fix #10133, use "resolved" (keep reference) instead of target (filesystem
X-Git-Tag: 1.1.0~701^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/04f0197d84cbde94a487ab695357befa2f47a7de

Fix #10133, use "resolved" (keep reference) instead of target (filesystem
path).  I think this was a merge conflict mistake.
---

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 839239258d..4e91d6628a 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -85,7 +85,7 @@ def upload_dependencies(arvrunner, name, document_loader,
 
     def setloc(p):
         if not p["location"].startswith("_:") and not p["location"].startswith("keep:"):
-            p["location"] = mapper.mapper(p["location"]).target
+            p["location"] = mapper.mapper(p["location"]).resolved
     adjustFileObjs(workflowobj, setloc)
     adjustDirObjs(workflowobj, setloc)