install-deps.sh: refactor pip install a little bit

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/install-deps.sh b/install-deps.sh
index b99c310aaac030cae96d83c424bd41a2d2af0fe4..287152f74f9db70294f93abc5c11625998ef058b 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -86,12 +86,16 @@ esac
 
 function get_pip_and_wheel() {
     local install=$1
+    shift
 
     # Ubuntu-12.04 and Python 2.7.3 require this line
     pip --timeout 300 $install 'distribute >= 0.7.3' || return 1
     # although pip comes with virtualenv, having a recent version
     # of pip matters when it comes to using wheel packages
     pip --timeout 300 $install 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' || return 1
+    if test $# != 0 ; then
+        pip --timeout 300 $install $@ || return 1
+    fi
 }
 
 # use pip cache if possible but do not store it outside of the source
@@ -121,8 +125,7 @@ find . -name tox.ini | while read ini ; do
             for interpreter in python2.7 python3 ; do
                 type $interpreter > /dev/null 2>&1 || continue
                 . $top_srcdir/install-deps-$interpreter/bin/activate
-                get_pip_and_wheel wheel || exit 1
-                pip --timeout 300 wheel $require || exit 1
+                get_pip_and_wheel wheel $require || exit 1
             done
         fi
     )