From: John Spray Date: Tue, 24 Jan 2017 01:05:13 +0000 (+0000) Subject: build_utils: fix setuptools installation X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20a2e4f8e3623b57beb1b4a8fcc5f86970a10b4b;p=ceph-build.git build_utils: fix setuptools installation Hopefully the original order of pip vs. setuptools in this script was not important, because apparently we now need latest pip in order to install setuptools. Fixes: http://tracker.ceph.com/issues/18645 Signed-off-by: John Spray --- diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index dbc42680..8c8a3974 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -47,13 +47,13 @@ install_python_packages_no_binary () { PIP_SDIST_INDEX="$HOME/.cache/pip" mkdir -p $PIP_SDIST_INDEX - echo "Updating setuptools" - $VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" setuptools - echo "Ensuring latest pip is installed" $VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" pip $VENV/pip install --upgrade --exists-action=i --find-links="file://$PIP_SDIST_INDEX" --no-index pip + echo "Updating setuptools" + $VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" setuptools + pkgs=("${!1}") for package in ${pkgs[@]}; do echo $package @@ -81,13 +81,13 @@ install_python_packages () { PIP_SDIST_INDEX="$HOME/.cache/pip" mkdir -p $PIP_SDIST_INDEX - echo "Updating setuptools" - $VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" setuptools - echo "Ensuring latest pip is installed" $VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" pip $VENV/pip install --upgrade --exists-action=i --find-links="file://$PIP_SDIST_INDEX" --no-index pip + echo "Updating setuptools" + $VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" setuptools + pkgs=("${!1}") for package in ${pkgs[@]}; do echo $package