[ARVADOS] updated: 83cafb38e512275be28b1bdc1ac439adf8d9f553

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  83cafb38e512275be28b1bdc1ac439adf8d9f553 (commit)
      from  42d4746b7e446811c98c518db03a986a3a499ae1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 83cafb38e512275be28b1bdc1ac439adf8d9f553
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 11 14:37:13 2016 -0500

    8673: Fix --project-uuid for arv-keepdocker upload.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 9556cf4..f69591b 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -48,10 +48,10 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
 
     if not images:
         imageId = cwltool.docker.get_image(dockerRequirement, pull_image)
-        args = ["--project-uuid", project_uuid, image_name]
+        args = ["--project-uuid="+project_uuid, image_name]
         if image_tag:
             args.append(image_tag)
-        logger.info("Uploading Docker image %s", ":".join(args))
+        logger.info("Uploading Docker image %s", ":".join(args[1:]))
         arvados.commands.keepdocker.main(args)
 
     return dockerRequirement["dockerImageId"]
@@ -414,6 +414,8 @@ class ArvCwlRunner(object):
 
                 if self.final_output is None:
                     raise cwltool.workflow.WorkflowException("Workflow did not return a result.")
+
+                # create final output collection
             except:
                 if sys.exc_info()[0] is KeyboardInterrupt:
                     logger.error("Interrupted, marking pipeline as failed")

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


hooks/post-receive
--