Always upgrade pip and setuptools

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/bootstrap b/bootstrap
index 3eafcae68a7cd18e2c09ee190fd7ea36d2561300..f4a39971403b4a50784d5cff6cd2d80db1073781 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -109,12 +109,12 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./virtualenv ]; then
         pip install virtualenv
     fi
     virtualenv --setuptools virtualenv
+fi
 
-    # avoid pip bugs
-    ./virtualenv/bin/pip install --upgrade pip
+# Upgrade pip first
+./virtualenv/bin/pip install --upgrade pip
 
-    # work-around change in pip 1.5
-    ./virtualenv/bin/pip install 'setuptools<18.6' --no-use-wheel --upgrade
-fi
+# work-around change in pip 1.5
+./virtualenv/bin/pip install 'setuptools<18.6' --no-use-wheel --upgrade
 
 ./virtualenv/bin/pip install --upgrade -r requirements.txt