[ARVADOS] updated: 651dc72cbcadcbeba7012f835c945f15acb3606c

git at public.curoverse.com git at public.curoverse.com
Tue Sep 9 11:20:01 EDT 2014


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

       via  651dc72cbcadcbeba7012f835c945f15acb3606c (commit)
      from  ccc1d433b03a5b2d78bccfda15361abc0bdc88ed (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 651dc72cbcadcbeba7012f835c945f15acb3606c
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Sep 9 11:17:56 2014 -0400

    3699: fix bugs

diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/copy.py
index 42d1079..649556e 100755
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/copy.py
@@ -237,28 +237,26 @@ def copy_git_repo(src_git_repo, dst_git_repo, dst_branch, src=None, dst=None):
         raise Exception('cannot identify source repo {}; {} repos found'
                         .format(src_git_repo, r['items_available']))
     src_git_url = r['items'][0]['fetch_url']
-    logger.debug('src_git_url: {}'.format(src_git_url)
+    logger.debug('src_git_url: {}'.format(src_git_url))
 
     r = dst.repositories().list(
         filters=[['name', '=', dst_git_repo]]).execute()
     if r['items_available'] != 1:
         raise Exception('cannot identify source repo {}; {} repos found'
                         .format(dst_git_repo, r['items_available']))
-    dst_git_fetch_url = r['items'][0]['fetch_url']
     dst_git_push_url  = r['items'][0]['push_url']
-    logger.debug('dst_git_fetch_url: {}'.format(dst_git_fetch_url)
-    logger.debug('dst_git_push_url: {}'.format(dst_git_push_url)
+    logger.debug('dst_git_push_url: {}'.format(dst_git_push_url))
 
     tmprepo = tempfile.mkdtemp()
 
     arvados.util.run_command(
-        ["git", "clone", dst_git_fetch_url, tmprepo],
+        ["git", "clone", src_git_url, tmprepo],
         cwd=os.path.dirname(tmprepo))
     arvados.util.run_command(
         ["git", "checkout", "-B", dst_branch],
         cwd=tmprepo)
-    arvados.util.run_command(["git", "pull", src_git_url], cwd=tmprepo)
-    arvados.util.run_command(["git", "push", dst_git_push_url], cwd=tmprepo)
+    arvados.util.run_comment(["git", "remote", "add", "dst", dst_git_push_url], cwd=tmprepo)
+    arvados.util.run_command(["git", "push", "dst"], cwd=tmprepo)
 
 # uuid_type(api, object_uuid)
 #

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list