[ARVADOS] updated: 1.3.0-523-g233e184ea

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

       via  233e184eaf40febfbc9b083bdfdd45a438cc350f (commit)
      from  dc71f08c4a78e6e53a4da6f88fd054a9e39600ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 233e184eaf40febfbc9b083bdfdd45a438cc350f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Mar 15 10:10:15 2019 -0400

    Fix a-c-r printing logs on error refs #14870
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 03b4e07c7..6aa9a3406 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -329,8 +329,8 @@ class ArvadosContainer(JobBase):
             else:
                 processStatus = "permanentFail"
 
-            if processStatus == "permanentFail":
-                logc = arvados.collection.CollectionReader(container["log"],
+            if processStatus == "permanentFail" and record["log_uuid"]:
+                logc = arvados.collection.CollectionReader(record["log_uuid"],
                                                            api_client=self.arvrunner.api,
                                                            keep_client=self.arvrunner.keep_client,
                                                            num_retries=self.arvrunner.num_retries)
@@ -353,8 +353,8 @@ class ArvadosContainer(JobBase):
             if container["output"]:
                 outputs = done.done_outputs(self, container, "/tmp", self.outdir, "/keep")
         except WorkflowException as e:
-            # Only include a stack trace if in debug mode. 
-            # A stack trace may obfuscate more useful output about the workflow. 
+            # Only include a stack trace if in debug mode.
+            # A stack trace may obfuscate more useful output about the workflow.
             logger.error("%s unable to collect output from %s:\n%s",
                          self.arvrunner.label(self), container["output"], e, exc_info=(e if self.arvrunner.debug else False))
             processStatus = "permanentFail"

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


hooks/post-receive
--