Work around a change in pip 1.5 regarding wheels

The error message was "pip's wheel support requires setuptools >= 0.8
for dist-info support."

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
(cherry picked from commit eaa3e1240e3b7ba120f769d00f2ed28eda4a7ed1)

diff --git a/bootstrap b/bootstrap
index d03ad66619e536037a0f6896f53ff1e4bd13199f..46590caf98272a288d5454226bd7b585a6bcd7ee 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -20,6 +20,9 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./virtualenv ]; then
 
     # avoid pip bugs
     ./virtualenv/bin/pip install --upgrade pip
+
+    # work-around change in pip 1.5
+    ./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
 fi
 
 ./virtualenv/bin/pip install -r requirements.txt