[ARVADOS] created: 55e693dc29608f9b9975bb40c2fe4cf9c51df3f1

[Git user]

        at  55e693dc29608f9b9975bb40c2fe4cf9c51df3f1 (commit)


commit 55e693dc29608f9b9975bb40c2fe4cf9c51df3f1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Nov 22 10:33:01 2016 -0500

    10498: Handle project_uuid of None in arv_docker_get_image.

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index b9691d2..7f6ab58 100644
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -36,7 +36,10 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
         cwltool.docker.get_image(dockerRequirement, pull_image)
 
         # Upload image to Arvados
-        args = ["--project-uuid="+project_uuid, image_name]
+        args = []
+        if project_uuid:
+            args.append("--project-uuid="+project_uuid)
+        args.append(image_name)
         if image_tag:
             args.append(image_tag)
         logger.info("Uploading Docker image %s", ":".join(args[1:]))

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


hooks/post-receive
--