openstack/devstack
Code Issues Proposed changes

Merge "make get-pip.py download failures more clear"

Browse Source
This commit is contained in:
Jenkins 2014-06-10 15:16:04 +00:00 committed by Gerrit Code Review
commit c3fd0b5298
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/install_pip.sh
View File

@ -25,6 +25,7 @@ source $TOP_DIR/functions
FILES=$TOP_DIR/files FILES=$TOP_DIR/files
PIP_GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py PIP_GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
LOCAL_PIP="$FILES/$(basename $PIP_GET_PIP_URL)"
GetDistro GetDistro
echo "Distro: $DISTRO" echo "Distro: $DISTRO"
@ -41,12 +42,11 @@ function get_versions {
function install_get_pip { function install_get_pip {
if [[ ! -r $FILES/get-pip.py ]]; then if [[ ! -r $LOCAL_PIP ]]; then
(cd $FILES; \ curl -o $LOCAL_PIP $PIP_GET_PIP_URL || \
curl -O $PIP_GET_PIP_URL; \ die $LINENO "Download of get-pip.py failed"
)
fi fi
sudo -E python $FILES/get-pip.py sudo -E python $LOCAL_PIP
} }