Work around issue where pip fails on fixing distribute issues if dist…

…ribute is already fine. bcbio/bcbio-nextgen#207
arq5x · Dec 11, 2013 · 5aad476 · 5aad476
1 parent 5bc8279
commit 5aad476
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/gemini/scripts/gemini_install.py b/gemini/scripts/gemini_install.py
@@ -58,7 +58,7 @@ def main(args):
     print " Tools installed in:\n  %s" % args.tooldir
     print " Data installed in:\n  %s" % args.datadir
     print " Run tests with:\n  cd %s && bash %s" % (os.path.dirname(test_script),
-os.path.basename(test_script))
+                                                    os.path.basename(test_script))
     print " NOTE: be sure to add %s/bin to your PATH." % args.tooldir
 
     shutil.rmtree(work_dir)
@@ -70,7 +70,10 @@ def install_gemini(anaconda, remotes, datadir, tooldir, use_sudo):
     try:
         subprocess.check_call([anaconda["easy_install"], "--upgrade", "distribute"])
     except subprocess.CalledProcessError:
-        subprocess.check_call([anaconda["pip"], "install", "--upgrade", "distribute"])
+        try:
+            subprocess.check_call([anaconda["pip"], "install", "--upgrade", "distribute"])
+        except subprocess.CalledProcessError:
+            pass
     # Ensure latest version of fabric for running CloudBioLinux
     subprocess.check_call([anaconda["pip"], "install", "fabric>=1.7.0"])
     # Install problem dependency separately: bx-python