openstack/devstack
Code Issues Proposed changes

Merge "remove deprecated pip option"

Browse Source
This commit is contained in:
Jenkins 2014-10-02 04:08:21 +00:00 committed by Gerrit Code Review
commit d38675cd9e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions-common
View File

@ -1523,9 +1523,8 @@ function pip_install {
http_proxy=$http_proxy \
https_proxy=$https_proxy \
no_proxy=$no_proxy \
$cmd_pip install --build=${pip_build_tmp} \
$pip_mirror_opt $@ \
&& $sudo_pip rm -rf ${pip_build_tmp}
$cmd_pip install \
$pip_mirror_opt $@
if [[ "$INSTALL_TESTONLY_PACKAGES" == "True" ]]; then
local test_req="$@/test-requirements.txt"
@ -1534,9 +1533,8 @@ function pip_install {
http_proxy=$http_proxy \
https_proxy=$https_proxy \
no_proxy=$no_proxy \
$cmd_pip install --build=${pip_build_tmp} \
$pip_mirror_opt -r $test_req \
&& $sudo_pip rm -rf ${pip_build_tmp}
$cmd_pip install \
$pip_mirror_opt -r $test_req
fi
fi
}