From 68bb43535e8f032890687be6a253c3505cb319e5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 31 Mar 2020 23:18:56 +0200
Subject: [PATCH] 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
---
 .../elements/install-bin/pre-install.d/01-install-bin  |  4 +++-
 .../pip-and-virtualenv-source-install/04-install-pip   | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/diskimage_builder/elements/install-bin/pre-install.d/01-install-bin b/diskimage_builder/elements/install-bin/pre-install.d/01-install-bin
index 59b38a01..12cd6294 100755
--- a/diskimage_builder/elements/install-bin/pre-install.d/01-install-bin
+++ b/diskimage_builder/elements/install-bin/pre-install.d/01-install-bin
@@ -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
diff --git a/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
index e7b69feb..bec0f624 100755
--- a/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
+++ b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
@@ -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
             ;;