[ARVADOS] updated: a7222f4df954c9ac973d58bb2f27a8f049dbbbc2

Git user git at public.curoverse.com
Wed Jan 25 14:31:59 EST 2017


Summary of changes:
 sdk/cwl/arvados_cwl/arvdocker.py | 2 ++
 1 file changed, 2 insertions(+)

       via  a7222f4df954c9ac973d58bb2f27a8f049dbbbc2 (commit)
      from  a3ca6693f522b59ea50d76cadde69b91c0a62cad (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 a7222f4df954c9ac973d58bb2f27a8f049dbbbc2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 25 14:31:52 2017 -0500

    arv_docker_get_image should not modify dockerRequirement parameter.  refs #10812

diff --git a/sdk/cwl/arvados_cwl/arvdocker.py b/sdk/cwl/arvados_cwl/arvdocker.py
index 88c5dd2..f83add9 100644
--- a/sdk/cwl/arvados_cwl/arvdocker.py
+++ b/sdk/cwl/arvados_cwl/arvdocker.py
@@ -1,6 +1,7 @@
 import logging
 import sys
 import threading
+import copy
 
 from schema_salad.sourceline import SourceLine
 
@@ -17,6 +18,7 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image, project_uuid
     """Check if a Docker image is available in Keep, if not, upload it using arv-keepdocker."""
 
     if "dockerImageId" not in dockerRequirement and "dockerPull" in dockerRequirement:
+        dockerRequirement = copy.deepcopy(dockerRequirement)
         dockerRequirement["dockerImageId"] = dockerRequirement["dockerPull"]
         if hasattr(dockerRequirement, 'lc'):
             dockerRequirement.lc.data["dockerImageId"] = dockerRequirement.lc.data["dockerPull"]

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list