From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 2 Dec 2015 17:35:28 +0000 (-0500)
Subject: ensure latest pip is installed, preventing odl, distro-based pip being used
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5fb36ebf8cbbdaec78ae3ca41ce6c38254ec2a1;p=ceph-build.git

ensure latest pip is installed, preventing odl, distro-based pip being used

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 889da587..105a5460 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -11,7 +11,7 @@ install_python_packages () {
     # Usage:
     #
     #   to_install=( "ansible" "chacractl>=0.0.4" )
-    #   install_python_packages "to_install[@]" 
+    #   install_python_packages "to_install[@]"
 
     # Create the virtualenv
     virtualenv $WORKSPACE/venv
@@ -20,6 +20,10 @@ install_python_packages () {
     PIP_SDIST_INDEX="$HOME/.cache/pip"
     mkdir -p $PIP_SDIST_INDEX
 
+    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
+
     pkgs=("${!1}")
     for package in ${pkgs[@]}; do
         echo $package