gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-26 07:28:10 -07:00
Code Issues Projects Releases Wiki Activity

python-utils-r1.eclass: Fix matching pattern list starting with 3.10

Browse Source 
Closes: https://bugs.gentoo.org/955213
Fixes: 92cf8fae50 (Disable Python 3.10 / PyPy 3.10 targets)
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2025-05-02 06:10:01 +02:00
parent a2bd53b090
commit d133f3d0eb
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eclass/python-utils-r1.eclass
View File

@@ -208,6 +208,8 @@ _python_impl_matches() {
local impl=${1/./_} pattern
shift
# note: do not add "return 1" below, the function is supposed
# to iterate until it matches something
for pattern; do
case ${pattern} in
-2|python2*|pypy)
@@ -229,7 +231,6 @@ _python_impl_matches() {
return 0
;;
3.10)
return 1
;;
3.8|3.9|3.1[1-3])
[[ ${impl%t} == python${pattern/./_} || ${impl} == pypy${pattern/./_} ]] &&

9
eclass/tests/python-utils-r1.sh
View File

@@ -212,6 +212,15 @@ test_is "_python_impl_matches python3_12 3.12" 0
test_is "_python_impl_matches pypy3_11 3.10" 1
test_is "_python_impl_matches pypy3_11 3.11" 0
test_is "_python_impl_matches pypy3_11 3.12" 1
# https://bugs.gentoo.org/95521
test_is "_python_impl_matches python3_11 3.10 3.11" 0
test_is "_python_impl_matches python3_11 3.11 3.12" 0
test_is "_python_impl_matches python3_11 3.10 3.12" 1
test_is "_python_impl_matches python3_11 3.10 3.11 3.12" 0
test_is "_python_impl_matches python3_12 3.10 3.11" 1
test_is "_python_impl_matches python3_12 3.11 3.12" 0
test_is "_python_impl_matches python3_12 3.10 3.12" 0
test_is "_python_impl_matches python3_12 3.10 3.11 3.12" 0
eoutdent
rm "${tmpfile}"