From 750b827a22748dae4655ba532155d177fb63d2eb Mon Sep 17 00:00:00 2001
From: Wes Hayutin <weshayutin@gmail.com>
Date: Tue, 1 May 2018 21:23:35 -0400
Subject: [PATCH] use --force-reinstall for tqe

If bootstrap is called twice the requirements in
quickstart-extras-requirements will not be reinstalled.
replacing no-cache-dir w/ force-reinstall ensures the
latest tqe and other requirements are installed.

Change-Id: I1e7bdc5c07915fb7dc0aae95a71f9dd4c7cd21b7
---
 quickstart.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickstart.sh b/quickstart.sh
index 0017c3db8..aa50a68ff 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -135,6 +135,7 @@ bootstrap () {
 
     pushd $OOOQ_DIR
         python setup.py install egg_info --egg-base $OPT_WORKDIR || { echo 'python setup.py install failed' ; exit 1; }
+        pip install --force-reinstall "${OPT_REQARGS[@]}" || { echo 'python setup.py install failed' ; exit 1; }
         if [ -x "$ZUUL_CLONER" ] && [ ! -z "$ZUUL_BRANCH" ]; then
             mkdir -p .tmp
             EXTRAS_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
@@ -147,8 +148,6 @@ bootstrap () {
                 pip install  .
             popd
         fi
-        # Handle the case that pip is too old to use a cache-dir
-        pip install --no-cache-dir "${OPT_REQARGS[@]}" || { echo 'python setup.py install failed' ; exit 1; }
     popd
     )
     # In order to do any filesystem operations on the system running ansible (if it has SELinux intalled)