Merge branch '10081-cwl-run-same-job' closes #10081

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

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index 7cde2736c6f80fe98616de84c498a1f965912708..78bca6e0e1ea9ffc49d6b35287556e98284658f5 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -40,7 +40,6 @@ class ArvadosJob(object):
         if self.generatefiles["listing"]:
             vwd = arvados.collection.Collection()
             script_parameters["task.vwd"] = {}
-            logger.debug("generatefiles is %s", json.dumps(self.generatefiles, indent=4))
             generatemapper = InitialWorkDirPathMapper([self.generatefiles], "", "",
                                         separateDirs=False)
             for f, p in generatemapper.items():
@@ -187,9 +186,11 @@ class ArvadosJob(object):
             except WorkflowException as e:
                 logger.error("Error while collecting job outputs:\n%s", e, exc_info=(e if self.arvrunner.debug else False))
                 processStatus = "permanentFail"
+                outputs = None
             except Exception as e:
                 logger.exception("Got unknown exception while collecting job outputs:")
                 processStatus = "permanentFail"
+                outputs = None
 
             self.output_callback(outputs, processStatus)
         finally: