[ARVADOS] updated: f9b76c1bcdde33e12005be718bca0065813748f8

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py     | 4 ++++
 sdk/cwl/arvados_cwl/arvcontainer.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  f9b76c1bcdde33e12005be718bca0065813748f8 (commit)
      from  4553a0c5e4fdc7628c4ed76dd8cce52b8d24e759 (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 f9b76c1bcdde33e12005be718bca0065813748f8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Nov 30 16:39:14 2016 -0500

    10293: Improve error messages for --api and unsupported InitialWorkDirRequirement.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index d394949..bd65252 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -567,6 +567,10 @@ def main(args, stdout, stderr, api_client=None, keep_client=None):
             return 1
         arvargs.work_api = want_api
 
+    if arvargs.work_api not in ("jobs", "containers"):
+        logger.error("Unknown --api '%s' expected one of 'jobs' or 'containers'", arvargs.work_api)
+        return 1
+
     if (arvargs.create_workflow or arvargs.update_workflow) and not arvargs.job_order:
         job_order_object = ({}, "")
 
diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 0c65df4..4dd79a1 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -62,7 +62,7 @@ class ArvadosContainer(object):
                 }
 
         if self.generatefiles["listing"]:
-            raise UnsupportedRequirement("Generate files not supported")
+            raise UnsupportedRequirement("InitialWorkDirRequirement not supported with --api=containers")
 
         container_request["environment"] = {"TMPDIR": self.tmpdir, "HOME": self.outdir}
         if self.environment:

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


hooks/post-receive
--