[ARVADOS] updated: 15635ff9fa2c964fb45467c9846ed92f7f6388b9

[Git user]

Summary of changes:
 build/run-build-packages.sh         |  4 ++--
 sdk/cwl/arvados_cwl/__init__.py     |  1 +
 sdk/cwl/arvados_cwl/arvcontainer.py | 12 ++++++------
 sdk/cwl/setup.py                    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

       via  15635ff9fa2c964fb45467c9846ed92f7f6388b9 (commit)
       via  e2598332f9ecd40ab0dfd025bd1e5eba02ad8673 (commit)
       via  0e1522f8e0cbe5d1626a7f66dc4c28b7b1bf0efc (commit)
       via  2f6b00cc2a8765e9f8e07f98239f8f1f06887e2e (commit)
      from  e4a51416586f73593ac68bf0d2a74c53a4875f7e (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 15635ff9fa2c964fb45467c9846ed92f7f6388b9
Merge: e259833 0e1522f
Author: radhika <radhika at curoverse.com>
Date:   Tue Nov 22 16:31:28 2016 -0500

    Merge branch 'master' into 10293-cwl-cr-output


commit e2598332f9ecd40ab0dfd025bd1e5eba02ad8673
Author: radhika <radhika at curoverse.com>
Date:   Tue Nov 22 16:30:45 2016 -0500

    10293: done_outputs in a try/except block

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index c349839..4c1915f 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -148,12 +148,12 @@ class ArvadosContainer(object):
             outputs = {}
 
             if container["output"]:
-                outputs = done.done_outputs(self, container, "/tmp", self.outdir, "/keep")
-            try:
-                self.output_callback(outputs, processStatus)
-            except Exception as e:
-                logger.error("Got error %s" % str(e))
-                self.output_callback({}, "permanentFail")
+                try:
+                    outputs = done.done_outputs(self, container, "/tmp", self.outdir, "/keep")
+                except Exception as e:
+                    logger.error("Got error %s" % str(e))
+                    self.output_callback({}, "permanentFail")
+            self.output_callback(outputs, processStatus)
         finally:
             del self.arvrunner.processes[record["uuid"]]
 

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


hooks/post-receive
--