commit 99405a45aa3930a9b695d9a1c1dabf0d967e48ad
author Roman Gorodeckij <holms@holms.lt> Wed Aug 07 09:20:36 2013 -0400
committer Roman Gorodeckij <holms@holms.lt> Mon Aug 12 09:39:52 2013 -0400
tree 7dc2b9ef03b63bfbd3398ba0d18a7d76cc105371
parent dc70e94896033b9ec2f916d8642fb410bfe301b2

Pip install fails because of --use-mirrors parameter

Having --use-mirrors parameter in pip commands causes pip to hang on
some distros.

Pypi uses CDN for long time already, so there's no point to keep this
parameter no more.

Wipe PIP_USE_MIRRORS out of the "function" file.

Change-Id: I70adaf6591834af2482e09eb7f8f9f60df8e7692
Closes-Bug: #1069309

functions

diff --git a/functions b/functions
index e9c6061..087a0ea 100644
--- a/functions
+++ b/functions
@@ -944,13 +944,9 @@
         CMD_PIP=$(get_pip_command)
     fi
 
-    if is_fedora && [[ $DISTRO =~ (rhel6) ]]; then
-        # RHEL6 pip by default doesn't have this (was introduced
-        # around 0.8.1 or so)
-        PIP_USE_MIRRORS=${PIP_USE_MIRRORS:-False}
-    else
-        PIP_USE_MIRRORS=${PIP_USE_MIRRORS:-True}
-    fi
+    # Mirror option not needed anymore because pypi has CDN available,
+    # but it's useful in certain circumstances
+    PIP_USE_MIRRORS=${PIP_USE_MIRRORS:-False}
     if [[ "$PIP_USE_MIRRORS" != "False" ]]; then
         PIP_MIRROR_OPT="--use-mirrors"
     fi