[ARVADOS] updated: c18a47461c7515e46967b9621af01a6699d036cb
git at public.curoverse.com
git at public.curoverse.com
Mon Sep 15 10:41:03 EDT 2014
Summary of changes:
sdk/python/arvados/commands/copy.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
via c18a47461c7515e46967b9621af01a6699d036cb (commit)
from 9fe1eb15e54fb07ba90f74043ecb044ce3c198f7 (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 c18a47461c7515e46967b9621af01a6699d036cb
Author: Tim Pierce <twp at curoverse.com>
Date: Mon Sep 15 10:40:45 2014 -0400
3699: bug fix (return value for copy_git_repo)
diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/copy.py
index ca787d5..936a977 100755
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/copy.py
@@ -211,15 +211,17 @@ def copy_collections(obj, src, dst):
# copy_git_repos(p, dst_repo, src, dst)
#
-# Copy all git repositories referenced by pipeline instance or
+# Copies all git repositories referenced by pipeline instance or
# template 'p' from src to dst.
#
-# p is updated
# Git repository dependencies are identified by:
# * p['components'][c]['repository']
# * p['components'][c]['job']['repository']
# for each component c in the pipeline.
#
+# The pipeline object is updated in place with the new repository
+# names. The return value is undefined.
+#
def copy_git_repos(p, dst_repo, src=None, dst=None):
copied = set()
for c in p['components']:
@@ -236,11 +238,10 @@ def copy_git_repos(p, dst_repo, src=None, dst=None):
copy_git_repo(repo, dst_repo, src, dst)
copied.add(repo)
component['job']['repository'] = dst_repo
- return repos
# copy_collection(obj_uuid, src, dst)
#
-# Copy the collection identified by obj_uuid from src to dst.
+# Copies the collection identified by obj_uuid from src to dst.
# Returns the collection object created at dst.
#
# For this application, it is critical to preserve the
@@ -296,9 +297,12 @@ def copy_collection(obj_uuid, src=None, dst=None):
# copy_git_repo(src_git_repo, dst_git_repo, src, dst)
#
# Copies commits from git repository 'src_git_repo' on Arvados
-# instance 'src' to 'dst_git_repo' on 'dst'. All commits will be
-# copied to a destination branch named for the source repository
-# URL.
+# instance 'src' to 'dst_git_repo' on 'dst'. Both src_git_repo
+# and dst_git_repo are repository names, not UUIDs (i.e. "arvados"
+# or "jsmith")
+#
+# All commits will be copied to a destination branch named for the
+# source repository URL.
#
# Because users cannot create their own repositories, the
# destination repository must already exist.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list