13108: Fix tracking tasks in flight

[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 52f7d8a235977f9fd7562d26caf4bcb61b887531..de329796e42384a18d4f4f669103c3fcb8a982a5 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvtool.py
+++ b/sdk/cwl/arvados_cwl/arvtool.py
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from cwltool.draft2tool import CommandLineTool
+from cwltool.command_line_tool import CommandLineTool
 from .arvjob import ArvadosJob
 from .arvcontainer import ArvadosContainer
 from .pathmapper import ArvPathMapper
@@ -37,7 +37,7 @@ class ArvadosCommandTool(CommandLineTool):
     def job(self, joborder, output_callback, **kwargs):
         if self.work_api == "containers":
             dockerReq, is_req = self.get_requirement("DockerRequirement")
-            if dockerReq.get("dockerOutputDirectory") and dockerReq.get("dockerOutputDirectory").startswith('/'):
+            if dockerReq and dockerReq.get("dockerOutputDirectory"):
                 kwargs["outdir"] = dockerReq.get("dockerOutputDirectory")
                 kwargs["docker_outdir"] = dockerReq.get("dockerOutputDirectory")
             else: