fix warning in install_get_pip

we were unconditionally adding -z to the curl command even if the file
doesn't exist that we are referencing. That produces a scary warning
for users. Lets not do that.

Change-Id: Id2860c1c702510b0f8fd496abce579d0fa3ff867
This commit is contained in:
Sean Dague 2015-10-07 09:06:42 -04:00
parent 72ad942796
commit a0cc2918ad
1 changed files with 8 additions and 1 deletions

View File

@ -53,8 +53,15 @@ function install_get_pip {
# since and only download if a new version is out -- but only if
# it seems we downloaded the file originally.
if [[ ! -r $LOCAL_PIP || -r $LOCAL_PIP.downloaded ]]; then
# only test freshness if LOCAL_PIP is actually there,
# otherwise we generate a scary warning.
local timecond=""
if [[ -r $LOCAL_PIP ]]; then
timecond="-z $LOCAL_PIP"
fi
curl --retry 6 --retry-delay 5 \
-z $LOCAL_PIP -o $LOCAL_PIP $PIP_GET_PIP_URL || \
$timecond -o $LOCAL_PIP $PIP_GET_PIP_URL || \
die $LINENO "Download of get-pip.py failed"
touch $LOCAL_PIP.downloaded
fi