commit 55181d2cfba5dd6bbbde42bb964782e8c2b8ee50
author Jenkins <jenkins@review.openstack.org> Tue Aug 13 20:53:05 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Aug 13 20:53:05 2013 +0000
tree f0d5c3e19d46c6b503c72d590e871d21b40957d6
parent 27899ccc1f7c833b11fa34314ed36e6a16a70090
parent 99405a45aa3930a9b695d9a1c1dabf0d967e48ad

Merge "Pip install fails because of --use-mirrors parameter"

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