13681: Revert to yaml.round_trip_dump instead of json.dumps().

[arvados.git] / sdk / cwl / arvados_cwl / arvtool.py

diff --git a/sdk/cwl/arvados_cwl/arvtool.py b/sdk/cwl/arvados_cwl/arvtool.py
index 742c671c74b1acc2c523e8beadfc243777146130..119acc30392ceb9f124a6d0101c0868beeb6c1ae 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvtool.py
+++ b/sdk/cwl/arvados_cwl/arvtool.py
@@ -20,8 +20,10 @@ class ArvadosCommandTool(CommandLineTool):
             return partial(ArvadosContainer, self.arvrunner)
         elif runtimeContext.work_api == "jobs":
             return partial(ArvadosJob, self.arvrunner)
+        else:
+            raise Exception("Unsupported work_api %s", runtimeContext.work_api)
 
-    def make_path_mapper(self, reffiles, stagedir, runtimeContext):
+    def make_path_mapper(self, reffiles, stagedir, runtimeContext, separateDirs):
         if runtimeContext.work_api == "containers":
             return ArvPathMapper(self.arvrunner, reffiles+runtimeContext.extra_reffiles, runtimeContext.basedir,
                                  "/keep/%s",