sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove extra if/then/else construct in pip element"

Browse Source
This commit is contained in:
Zuul 2022-02-09 05:19:36 +00:00 committed by Gerrit Code Review
commit f7c93fdca5
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,12 +250,11 @@ EOF
elif [[ $DISTRO_NAME = gentoo ]]; then elif [[ $DISTRO_NAME = gentoo ]]; then
packages="dev-python/pip dev-python/virtualenv" packages="dev-python/pip dev-python/virtualenv"
emerge -U $packages emerge -U $packages
else elif [[ $DIB_RELEASE = bullseye ]]; then
if [[ $DIB_RELEASE = bullseye ]]; then
packages="python3-pip python3-virtualenv" packages="python3-pip python3-virtualenv"
apt-get -y install $packages apt-get -y install $packages
install_python3_pip install_python3_pip
else else
# pre-install packages so dependencies are there. We will # pre-install packages so dependencies are there. We will
# overwrite with latest below. # overwrite with latest below.
packages="python-pip python-virtualenv" packages="python-pip python-virtualenv"
@ -274,5 +273,4 @@ else
if [[ ${DIB_PYTHON_VERSION} == 3 ]]; then if [[ ${DIB_PYTHON_VERSION} == 3 ]]; then
install_python3_pip install_python3_pip
fi fi
fi
fi fi