[ARVADOS] created: 23f0ec9bc86cc786f995c6b123b912b8ba3ce4d7
Git user
git at public.curoverse.com
Thu Nov 3 18:29:59 EDT 2016
at 23f0ec9bc86cc786f995c6b123b912b8ba3ce4d7 (commit)
commit 23f0ec9bc86cc786f995c6b123b912b8ba3ce4d7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Nov 3 18:13:29 2016 -0400
Check exit code before rethrowing error from catching SystemExit from
keepdocker.main. no issue #
diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index 244dd3d..68ecaf0 100644
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -33,8 +33,9 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
logger.info("Uploading Docker image %s", ":".join(args[1:]))
try:
arvados.commands.keepdocker.main(args, stdout=sys.stderr)
- except SystemExit:
- raise WorkflowException()
+ except SystemExit as e:
+ if e.code:
+ raise WorkflowException("keepdocker exited with code %s" % e.code)
images = arvados.commands.keepdocker.list_images_in_arv(api_client, 3,
image_name=image_name,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list