commit:     3a980b89c190cf3d84df63a33bb4540a3d45cb23
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 07:16:24 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 21:44:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a980b89

python-utils-r1.eclass: Fix python_fix_shebang for py3.10+

We should be safe until Python 3.99 now ;-).

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/python-utils-r1.eclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index b435ebaa7ad..2a34614bc7f 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1120,20 +1120,22 @@ python_fix_shebang() {
                                                        fi
                                                        break
                                                        ;;
-                                               
*python[23].[0123456789]|*pypy|*pypy3|*jython[23].[0123456789])
+                                               
*python[23].[0-9]|*python3.[1-9][0-9]|*pypy|*pypy3|*jython[23].[0-9])
                                                        # Explicit mismatch.
                                                        if [[ ! ${force} ]]; 
then
                                                                error=1
                                                        else
                                                                case "${i}" in
-                                                                       
*python[23].[0123456789])
-                                                                               
from="python[23].[0123456789]";;
+                                                                       
*python[23].[0-9])
+                                                                               
from="python[23].[0-9]";;
+                                                                       
*python3.[1-9][0-9])
+                                                                               
from="python3.[1-9][0-9]";;
                                                                        *pypy)
                                                                                
from="pypy";;
                                                                        *pypy3)
                                                                                
from="pypy3";;
-                                                                       
*jython[23].[0123456789])
-                                                                               
from="jython[23].[0123456789]";;
+                                                                       
*jython[23].[0-9])
+                                                                               
from="jython[23].[0-9]";;
                                                                        *)
                                                                                
die "${FUNCNAME}: internal error in 2nd pattern match";;
                                                                esac

Reply via email to