From 1a8d456e6e8b7026dfe1c1b1176e8d46f9f374e7 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 30 Nov 2016 16:39:14 -0500 Subject: [PATCH] 10293: Improve error messages for --api and unsupported InitialWorkDirRequirement. --- sdk/cwl/arvados_cwl/__init__.py | 4 ++++ sdk/cwl/arvados_cwl/arvcontainer.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py index d394949dec..bd65252321 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 0c65df4558..4dd79a10dd 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: -- 2.30.2