[ARVADOS] updated: 565198b9c115b5f9b5b190d76ca7a7a0901c9cc6

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/commands/copy.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

       via  565198b9c115b5f9b5b190d76ca7a7a0901c9cc6 (commit)
      from  4dac4271e852a29ea23f0fd8efb7db417b444f29 (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 565198b9c115b5f9b5b190d76ca7a7a0901c9cc6
Author: Tim Pierce <twp at curoverse.com>
Date:   Mon Sep 15 11:39:25 2014 -0400

    3699: allow pipeline instances without templates

diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/copy.py
index 3d79c76..6485c15 100755
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/copy.py
@@ -136,9 +136,10 @@ def copy_pipeline_instance(pi_uuid, src, dst, dst_git_repo, dst_project=None, re
 
     if recursive:
         # Copy the pipeline template and save the copied template.
-        pt = copy_pipeline_template(pi['pipeline_template_uuid'],
-                                    src, dst,
-                                    recursive=True)
+        if pi.get('pipeline_template_uuid', None):
+            pt = copy_pipeline_template(pi['pipeline_template_uuid'],
+                                        src, dst,
+                                        recursive=True)
 
         # Copy input collections, docker images and git repos.
         pi = copy_collections(pi, src, dst)
@@ -146,7 +147,8 @@ def copy_pipeline_instance(pi_uuid, src, dst, dst_git_repo, dst_project=None, re
 
         # Update the fields of the pipeline instance with the copied
         # pipeline template.
-        pi['pipeline_template_uuid'] = pt['uuid']
+        if pi.get('pipeline_template_uuid', None):
+            pi['pipeline_template_uuid'] = pt['uuid']
         if dst_project:
             pi['owner_uuid'] = dst_project
         else:

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


hooks/post-receive
--