[ARVADOS] updated: a0e2de21d7c0cb7d38a3fbfa279e2f8278c5280d

git at public.curoverse.com git at public.curoverse.com
Mon Sep 15 13:03:50 EDT 2014


Summary of changes:
 sdk/python/arvados/commands/copy.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

       via  a0e2de21d7c0cb7d38a3fbfa279e2f8278c5280d (commit)
      from  565198b9c115b5f9b5b190d76ca7a7a0901c9cc6 (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 a0e2de21d7c0cb7d38a3fbfa279e2f8278c5280d
Author: Tim Pierce <twp at curoverse.com>
Date:   Mon Sep 15 13:03:28 2014 -0400

    3699: copy_pipeline_template requires dst_git_repo

diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/copy.py
index 6485c15..c1d5f12 100755
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/copy.py
@@ -78,6 +78,7 @@ def main():
     elif t == 'PipelineTemplate':
         result = copy_pipeline_template(args.object_uuid,
                                         src_arv, dst_arv,
+                                        args.dst_git_repo,
                                         recursive=args.recursive)
     else:
         abort("cannot copy object {} of type {}".format(args.object_uuid, t))
@@ -139,6 +140,7 @@ def copy_pipeline_instance(pi_uuid, src, dst, dst_git_repo, dst_project=None, re
         if pi.get('pipeline_template_uuid', None):
             pt = copy_pipeline_template(pi['pipeline_template_uuid'],
                                         src, dst,
+                                        dst_git_repo,
                                         recursive=True)
 
         # Copy input collections, docker images and git repos.
@@ -160,10 +162,10 @@ def copy_pipeline_instance(pi_uuid, src, dst, dst_git_repo, dst_project=None, re
         print >>sys.stderr, "You are responsible for making sure all pipeline dependencies have been updated."
 
     # Create the new pipeline instance at the destination Arvados.
-    new_pi = dst.pipeline_instances().create(pipeline_instance=pi).execute()
+    new_pi = dst.pipeline_instances().create(body=pi).execute()
     return new_pi
 
-# copy_pipeline_template(pt_uuid, src, dst, recursive)
+# copy_pipeline_template(pt_uuid, src, dst, dst_git_repo, recursive)
 #
 #    Copies a pipeline template identified by pt_uuid from src to dst.
 #
@@ -175,7 +177,7 @@ def copy_pipeline_instance(pi_uuid, src, dst, dst_git_repo, dst_project=None, re
 #
 #    Returns the copied pipeline template object.
 #
-def copy_pipeline_template(pt_uuid, src, dst, recursive=True):
+def copy_pipeline_template(pt_uuid, src, dst, dst_git_repo, recursive=True):
     # fetch the pipeline template from the source instance
     pt = src.pipeline_templates().get(uuid=pt_uuid).execute()
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list