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

This commit is contained in:
Jenkins 2013-08-13 20:53:05 +00:00 committed by Gerrit Code Review
commit 55181d2cfb

View File

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