projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10460: Add check for 'dockerOutputDirectory' and raise UnsupportedError for now.
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvdocker.py
diff --git
a/sdk/cwl/arvados_cwl/arvdocker.py
b/sdk/cwl/arvados_cwl/arvdocker.py
index f9dba6eff4081e13103123146a1408e291672ca9..b9691d215c4d46e071d13740c2d3c90b9f7d1a81 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvdocker.py
+++ b/
sdk/cwl/arvados_cwl/arvdocker.py
@@
-42,8
+42,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)
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,
images = arvados.commands.keepdocker.list_images_in_arv(api_client, 3,
image_name=image_name,