mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
python-utils-r1.eclass: _python_impl_matches, handle both forms of impl
Make the pattern matching code in _python_impl_matches() more lax, allowing (accidental) mixing of PYTHON_COMPAT-style values with EPYTHON-style values. This is trivial to do, and solves the problem introduced by complexity-by-limitation of other eclasses -- where patterns for dependency strings are using PYTHON_COMPAT syntax, and patterns for python_setup are using EPYTHON syntax.
This commit is contained in:
@@ -169,7 +169,8 @@ _python_set_impls() {
|
||||
# Check whether the specified <impl> matches at least one
|
||||
# of the patterns following it. Return 0 if it does, 1 otherwise.
|
||||
#
|
||||
# <impl> should be in PYTHON_COMPAT form. The patterns can be either:
|
||||
# <impl> can be in PYTHON_COMPAT or EPYTHON form. The patterns can be
|
||||
# either:
|
||||
# a) fnmatch-style patterns, e.g. 'python2*', 'pypy'...
|
||||
# b) '-2' to indicate all Python 2 variants (= !python_is_python3)
|
||||
# c) '-3' to indicate all Python 3 variants (= python_is_python3)
|
||||
@@ -186,7 +187,8 @@ _python_impl_matches() {
|
||||
elif [[ ${pattern} == -3 ]]; then
|
||||
python_is_python3 "${impl}"
|
||||
return
|
||||
elif [[ ${impl} == ${pattern} ]]; then
|
||||
# unify value style to allow lax matching
|
||||
elif [[ ${impl/./_} == ${pattern/./_} ]]; then
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user