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 d394949dec962c5a6ebd6bdc0d4e229134ce7304..bd65252321f8186d8ec49f41fdb475b66a34490b 100644 (file)
--- 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 0c65df4558e9386b682289ecd3c858c6fce54cc7..4dd79a10dd8bf15bf3b50655cc9f5c64b1a91fb5 100644 (file)
--- 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: