From c9026b429df7228a5569d908ecfb3b4ebdc4e485 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 19 Mar 2019 11:33:58 -0400
Subject: [PATCH] CI: Fix Python modules in AppImage

 - set PYTHONPATH inside the AppImage so libcalamares is found
 - add Python module to the sample configuration
 - relax password requirements (while we're at it)
---
 ci/AppImage.sh                          | 1 +
 data/config-appimage/modules/users.conf | 3 ---
 data/config-appimage/settings.conf      | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci/AppImage.sh b/ci/AppImage.sh
index 7dccc4d89..e22309f12 100644
--- a/ci/AppImage.sh
+++ b/ci/AppImage.sh
@@ -176,6 +176,7 @@ cat > "$IMAGE_DIR/usr/bin/calamares" <<"EOF"
 # Calamares proxy-script
 export XDG_DATA_DIRS="$APPDIR/usr/share/calamares:"
 export XDG_CONFIG_DIRS="$APPDIR/etc/calamares:$D/usr/share:"
+export PYTHONPATH=$APPDIR/usr/lib:
 cd "$APPDIR"
 exec "$APPDIR"/usr/bin/calamares.bin -X "$@"
 EOF
diff --git a/data/config-appimage/modules/users.conf b/data/config-appimage/modules/users.conf
index 64b3aac43..bdf812878 100644
--- a/data/config-appimage/modules/users.conf
+++ b/data/config-appimage/modules/users.conf
@@ -55,8 +55,5 @@ doReusePassword: true
 passwordRequirements:
     minLength: -1  # Password at least this many characters
     maxLength: -1  # Password at most this many characters
-    libpwquality:
-        - minlen=0
-        - minclass=0
 
 userShell: /bin/bash
diff --git a/data/config-appimage/settings.conf b/data/config-appimage/settings.conf
index 54026cd6e..756710492 100644
--- a/data/config-appimage/settings.conf
+++ b/data/config-appimage/settings.conf
@@ -19,6 +19,7 @@ sequence:
   - users
   - summary
 - exec:
+  - dummypython
   - locale
   - keyboard
   - users