[ARVADOS] updated: 3be96c96a4ff1c519e03e6dc2036e0b93e41ee8c

git at public.curoverse.com git at public.curoverse.com
Wed Jul 29 08:06:57 EDT 2015


Summary of changes:
 sdk/python/arvados/commands/arv_copy.py | 19 +++++++++----------
 sdk/python/arvados/commands/put.py      |  2 ++
 services/fuse/arvados_fuse/__init__.py  | 29 +++++++++++++++--------------
 3 files changed, 26 insertions(+), 24 deletions(-)

       via  3be96c96a4ff1c519e03e6dc2036e0b93e41ee8c (commit)
       via  2b7d9f3f2e687d524ccc1d88e470e721f63f9e51 (commit)
       via  d22b2efd246ec82a5888d500bcbc7669654b842d (commit)
       via  6152230e1f77b925c2041d688805ab6764919805 (commit)
      from  ec64034683c31d76d02c293f0ae27d6ae80653cb (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 3be96c96a4ff1c519e03e6dc2036e0b93e41ee8c
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 29 08:06:34 2015 -0400

    6657: refactor git check and reuse.

diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py
index 62bf047..09cd9d4 100755
--- a/sdk/python/arvados/commands/arv_copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -188,6 +188,13 @@ def api_for_instance(instance_name):
         abort('need ARVADOS_API_HOST and ARVADOS_API_TOKEN for {}'.format(instance_name))
     return client
 
+# Check if git is available
+def check_git_availability():
+    try:
+        arvados.util.run_command(['git', '--help'])
+    except:
+        abort('git command is not available. Please ensure git is installed.')
+
 # copy_pipeline_instance(pi_uuid, src, dst, args)
 #
 #    Copies a pipeline instance identified by pi_uuid from src to dst.
@@ -212,11 +219,7 @@ def copy_pipeline_instance(pi_uuid, src, dst, args):
     pi = src.pipeline_instances().get(uuid=pi_uuid).execute(num_retries=args.retries)
 
     if args.recursive:
-        # Check if git is available
-        try:
-            arvados.util.run_command(['git', '--help'])
-        except:
-            abort('git command is not available. Please ensure git is installed.')
+        check_git_availability()
 
         if not args.dst_git_repo:
             abort('--dst-git-repo is required when copying a pipeline recursively.')
@@ -271,11 +274,7 @@ def copy_pipeline_template(pt_uuid, src, dst, args):
     pt = src.pipeline_templates().get(uuid=pt_uuid).execute(num_retries=args.retries)
 
     if args.recursive:
-        # Check if git is available
-        try:
-            arvados.util.run_command(['git', '--help'])
-        except:
-            abort('git command is not available. Please ensure git is installed.')
+        check_git_availability()
 
         if not args.dst_git_repo:
             abort('--dst-git-repo is required when copying a pipeline recursively.')

commit 2b7d9f3f2e687d524ccc1d88e470e721f63f9e51
Merge: ec64034 d22b2ef
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 28 17:44:44 2015 -0400

    Merge branch 'master' into 6657-no-git-in-arv-copy


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list