Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 devel/python3/HISTORY     |    3 +++
 devel/python3/UP_TRIGGERS |    9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 25a4f00998d19084a3512c1babba926a11fe8ae6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    python3: fix version upgrade triggers for 3.10 to 3.11+
    
    Really, people! ${VERSION:3:1} to extract the minor version?!
    Wherever this pattern exists in the grimoire, it has to be
    purged!

diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 46b2276..07da2b3 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,6 @@
+2023-10-16 Thomas Orgis <sobukus AT sourcemage.org>
+       * UP_TRIGGERS: fix for upgrades from 3.10 on
+
 2023-10-02 Pavel Vinogradov <public AT sorcemage.org>
        * DETAILS, PREPARE, patches-3.11/*: versions 3.12.0/3.11.6
        * python.gpg: added new key, A821E680E5FA6305, Thomas Wouters 
<thomas AT xs4all.nl>
diff --git a/devel/python3/UP_TRIGGERS b/devel/python3/UP_TRIGGERS
index dae9a3a..a04e720 100755
--- a/devel/python3/UP_TRIGGERS
+++ b/devel/python3/UP_TRIGGERS
@@ -2,18 +2,21 @@
 
 if spell_ok $SPELL; then
   local OLD_SPELL_VERSION="$(installed_version $SPELL)"
-  if test "${VERSION:2:1}" != "${OLD_SPELL_VERSION:2:1}"; then
+  local minor=$(echo     "$VERSION"           | cut -f 2 -d .)
+  local old_minor=$(echo "$OLD_SPELL_VERSION" | cut -f 2 -d .)
+  local old_pyver=$(echo "$OLD_SPELL_VERSION" | cut -f 1,2 -d .)
+  if test "$minor" != "$old_minor"; then
     message "This is a possibly incompatible update of python..."
     message "Figuring out what spells need to be recast, this may take a 
while."
 
     for each in $(show_up_depends $SPELL 1); do
       # Check in the install logs if python packages has been installed
-      if gaze install $each | grep -q 
"$TRACK_ROOT/usr/lib/python${OLD_SPELL_VERSION:0:3}/site-packages"; then
+      if gaze install $each | grep -q 
"$TRACK_ROOT/usr/lib/python$old_pyver/site-packages"; then
         up_trigger $each cast_self
       else
       # Check if the binaries link against libpython.so
         if gaze install $each | xargs readelf -d 2> /dev/null |
-          grep -q "NEEDED.*libpython${OLD_SPELL_VERSION:0:3}"; then
+          grep -q "NEEDED.*libpython$old_pyver"; then
           up_trigger $each cast_self
         fi
       fi