[ARVADOS] updated: 5c6bcd52032b2c974bc04e5e41282ae46835c08d

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

       via  5c6bcd52032b2c974bc04e5e41282ae46835c08d (commit)
       via  d84cefc8e4c34f36232e11c58af44d1afbbf89b3 (commit)
      from  d4a9835195f1c87d6d3436050d55bc60ba031259 (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 5c6bcd52032b2c974bc04e5e41282ae46835c08d
Merge: d4a9835 d84cefc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 11 16:33:06 2016 -0400

    Merge branch '9615-cwl-writable-unsupported' refs #9615


commit d84cefc8e4c34f36232e11c58af44d1afbbf89b3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 4 11:36:56 2016 -0400

    9615: Add check_writable to check for "writable" field and raise UnsupportedRequirement.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index fe3249c..abe916f 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -105,9 +105,21 @@ class ArvCwlRunner(object):
     def add_uploaded(self, src, pair):
         self.uploaded[src] = pair
 
+    def check_writable(self, obj):
+        if isinstance(obj, dict):
+            if obj.get("writable"):
+                raise UnsupportedRequirement("InitialWorkDir feature 'writable: true' not supported")
+            for v in obj.itervalues():
+                self.check_writable(v)
+        if isinstance(obj, list):
+            for v in obj:
+                self.check_writable(v)
+
     def arvExecutor(self, tool, job_order, **kwargs):
         self.debug = kwargs.get("debug")
 
+        tool.visit(self.check_writable)
+
         if kwargs.get("quiet"):
             logger.setLevel(logging.WARN)
             logging.getLogger('arvados.arv-run').setLevel(logging.WARN)

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


hooks/post-receive
--