openstack
/
diskimage-builder
Code Issues Proposed changes

opensuse: fix python 2.x install 

openSUSE Tumbleweed is dropping python2-* packages so we need
to stop intalling them. We can also stop installing those
for Leap 15. which avoids a pip uninstall issue (as python2-six
was still built with distribute).

Change-Id: Ie93c8addb26aab3d0154c4b5b52423799abede91
This commit is contained in:
Dirk Mueller 2020-03-31 23:18:56 +02:00
parent ac250e5ab0
commit 68bb43535e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/install-bin/pre-install.d/01-install-bin
View File

@ -6,4 +6,6 @@ fi
set -eu
set -o pipefail
install -m 0755 -o root -g root $(dirname $0)/../bin/* /usr/local/bin
for f in $(find $(dirname $0)/../bin/ -type f -executable -print); do
install -m 0755 -o root -g root $f /usr/local/bin
done

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

@ -59,9 +59,15 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel|rhel7) ]]; then
packages="python-virtualenv python-pip python-setuptools"
_clear_old_files=1
;;
tumbleweed|15*)
15*)
# XXX: python3?
packages="python2-virtualenv python2-pip python2-setuptools"
packages="python-xml python"
packages+=" python3-virtualenv python3-pip python3-setuptools"
;;
tumbleweed)
### _do_py3=1
packages="python-xml python"
packages+=" python3-virtualenv python3-pip python3-setuptools"
;;
esac
;;