diff options
author | Kefu Chai <kchai@redhat.com> | 2015-06-04 05:45:55 +0200 |
---|---|---|
committer | Kefu Chai <kchai@redhat.com> | 2015-06-04 07:52:04 +0200 |
commit | 0d845255c7d1f1b12513d2821fcedee5e2bae82c (patch) | |
tree | d42d8a91dadc654bc20d12accd503f678b618c0e /install-deps.sh | |
parent | Merge pull request #4855 from tchaikov/wip-man-page-fix (diff) | |
download | ceph-0d845255c7d1f1b12513d2821fcedee5e2bae82c.tar.xz ceph-0d845255c7d1f1b12513d2821fcedee5e2bae82c.zip |
install-deps.sh: refactor pip install a little bit
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'install-deps.sh')
-rwxr-xr-x | install-deps.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/install-deps.sh b/install-deps.sh index b99c310aaac..287152f74f9 100755 --- 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 ) |