[ARVADOS] updated: 0c447acb37a221a096249c6a9cfad4255c08f575

[git at public.curoverse.com]

Summary of changes:
 doc/_includes/_arv_copy_expectations.liquid                  |  6 ------
 doc/_includes/_install_ruby_and_bundler.liquid               |  2 +-
 doc/install/install-manual-prerequisites.html.textile.liquid |  9 ++++++++-
 doc/install/install-sso.html.textile.liquid                  |  2 +-
 sdk/python/arvados/commands/arv_copy.py                      | 12 ++++++------
 5 files changed, 16 insertions(+), 15 deletions(-)

       via  0c447acb37a221a096249c6a9cfad4255c08f575 (commit)
       via  e39e11d5850c1a2509f377e2f2551105507f59e3 (commit)
       via  004bafda085386b50e074eedf370ec40a386d6e5 (commit)
       via  c21473474aba30c12921961483990908ba525b82 (commit)
       via  56d94b28fc1ee2fe2f36f6743186e8b442c9e676 (commit)
       via  c8f0866051391c9932a8d39bbd3cacb83e60c20e (commit)
      from  3282d76febc482aab302a44bf594bcf9591ff868 (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 0c447acb37a221a096249c6a9cfad4255c08f575
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 28 14:00:17 2015 -0400

    6657: check git availability only when recursive copy is being used.

diff --git a/doc/_includes/_arv_copy_expectations.liquid b/doc/_includes/_arv_copy_expectations.liquid
index 50362de..a76c9e7 100644
--- a/doc/_includes/_arv_copy_expectations.liquid
+++ b/doc/_includes/_arv_copy_expectations.liquid
@@ -3,10 +3,4 @@ As stated above, arv-copy is recursive by default and requires a working git rep
 
 <br/>In addition, arv-copy requires git when copying to a git repository. Please make sure that git is installed and available.
 
-Use the following command to check if git is available.
-<notextile><pre><code>~$ <span class="userinput">git --help</span></code></pre></notextile>
-
-Use the following command to install git.
-<notextile><pre><code>~$ <span class="userinput">sudo apt-get install git</span></code></pre></notextile>
-
 {% include 'notebox_end' %}
diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py
index 5e48bc4..e7eb5a9 100755
--- a/sdk/python/arvados/commands/arv_copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -212,6 +212,12 @@ 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.')
+
         if not args.dst_git_repo:
             abort('--dst-git-repo is required when copying a pipeline recursively.')
         # Copy the pipeline template and save the copied template.
@@ -589,12 +595,6 @@ def copy_collection(obj_uuid, src, dst, args):
 #    to both repositories.
 #
 def copy_git_repo(src_git_repo, src, dst, dst_git_repo, script_version, args):
-    # Check if git is available
-    try:
-        arvados.util.run_command(['git', '--help'])
-    except:
-        raise Exception('git command is not available. Please ensure git is installed.')
-
     # Identify the fetch and push URLs for the git repositories.
     r = src.repositories().list(
         filters=[['name', '=', src_git_repo]]).execute(num_retries=args.retries)

commit e39e11d5850c1a2509f377e2f2551105507f59e3
Merge: 56d94b2 004bafd
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 28 13:48:40 2015 -0400

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


commit 56d94b28fc1ee2fe2f36f6743186e8b442c9e676
Merge: 3282d76 c8f0866
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 28 12:05:47 2015 -0400

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


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


hooks/post-receive
--