openstack
/
diskimage-builder
Code Issues Proposed changes

Dont install python-virtualenv for py3k in deb 

On ubuntu we detect that in python3 we need to install
python3-virtualenv, but append this to the packages to install rather
than replace python-virtualenv which results in both being installed
(and therefore grabbing python2).

Change-Id: I422490ebe9a9c655552685bc2ff342d288335a9c
Closes-Bug: #1724656
This commit is contained in:
Gregory Haynes 2017-10-18 12:24:30 -07:00
parent a0045985f2
commit 00d7c619e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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+=" python3-virtualenv"
packages=$(echo "$packages" | sed s/python-virtualenv/python3-virtualenv/)
fi
apt-get -y install $packages