openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Dont install python-pip for py3k"

This commit is contained in:
Zuul 2017-11-20 05:38:24 +00:00 committed by Gerrit Code Review
parent f0d6e04c52 ab89c7d69c
commit b879a03c75
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
View File

@ -112,7 +112,7 @@ else
# time and you had to use "python -m venv". Since then virtualenv
# has gained 3.4 support so the pip install below will work
if [[ ${DIB_PYTHON_VERSION} == 3 ]]; then
packages=$(echo "$packages" | sed s/python-virtualenv/python3-virtualenv/)
packages=$(echo "$packages" | sed s/python-virtualenv/python3-virtualenv/ | sed s/python-pip/python3-pip/)
fi
apt-get -y install $packages
@ -123,9 +123,12 @@ else
# These install into /usr/local/bin so override any packages, even
# if installed later.
python3 /tmp/get-pip.py $pip_args
python2 /tmp/get-pip.py $pip_args
if [[ ${DIB_PYTHON_VERSION} == 3 ]]; then
python3 /tmp/get-pip.py $pip_args
pip3 install $pip_args virtualenv
else
python2 /tmp/get-pip.py $pip_args
pip install $pip_args virtualenv
fi
pip3 install $pip_args virtualenv
pip install $pip_args virtualenv
fi