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

Remove extra if/then/else construct in pip element

Browse Source 
This was introduced in [0] but we can include it in the existing elif
series instead.

[0] I2b75afd310f009ae8614f6ca75bb984b56d25c45

Change-Id: Ibe05f367be997efbd8c5ebec77503ebd9cda1c8b
This commit is contained in:
Dr. Jens Harbott 2021-12-18 12:47:14 +01:00
parent f576658a4f
commit 9d60202d1c
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,29 +250,27 @@ 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
elif [[ $DIB_RELEASE = bullseye ]]; then
packages="python3-pip python3-virtualenv"
apt-get -y install $packages
install_python3_pip
else else
if [[ $DIB_RELEASE = bullseye ]]; then # pre-install packages so dependencies are there. We will
packages="python3-pip python3-virtualenv" # overwrite with latest below.
apt-get -y install $packages packages="python-pip python-virtualenv"
# Unfortunately older ubuntu (trusty) doesn't have a
# python3-virtualenv package -- it seems it wasn't ready at the
# 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-pip python3-virtualenv"
fi
apt-get -y install $packages
install_python2_pip
if [[ ${DIB_PYTHON_VERSION} == 3 ]]; then
install_python3_pip install_python3_pip
else
# pre-install packages so dependencies are there. We will
# overwrite with latest below.
packages="python-pip python-virtualenv"
# Unfortunately older ubuntu (trusty) doesn't have a
# python3-virtualenv package -- it seems it wasn't ready at the
# 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-pip python3-virtualenv"
fi
apt-get -y install $packages
install_python2_pip
if [[ ${DIB_PYTHON_VERSION} == 3 ]]; then
install_python3_pip
fi
fi fi
fi fi