diff options
| -rwxr-xr-x | python-updater | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/python-updater b/python-updater index 34e9da7..a4f3c0c 100755 --- a/python-updater +++ b/python-updater @@ -215,7 +215,7 @@ get_RESTRICT_PYTHON_ABIS() { fi } -# check_python_abi_matching(PYTHON_ABI, restricted_PYTHON_ABI) +# check_python_abi_matching(PYTHON_ABI, PYTHON_ABI_pattern) check_python_abi_matching() { if [[ "$2" == *"-cpython" ]]; then [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "$1" == ${2%-cpython} ]] @@ -476,8 +476,9 @@ fi for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do environment_file="${content/CONTENTS/environment.bz2}" - # Extract some variables. PYTHON_ABIS and PYTHON_REQUESTED_ACTIVE_VERSION are optional. + # Extract some variables. EAPI, PYTHON_ABIS and PYTHON_REQUESTED_ACTIVE_VERSION are optional. get_vdb_variable PVR "${environment_file}" || die "PVR missing" + get_vdb_variable EAPI "${environment_file}" get_vdb_variable PYTHON_ABIS "${environment_file}" get_vdb_variable PYTHON_REQUESTED_ACTIVE_VERSION "${environment_file}" @@ -537,6 +538,8 @@ for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do if [[ CHECK_PYTHON_ABIS -ne 0 ]]; then if [[ -n "${PYTHON_ABIS}" ]]; then + # Don't run PYTHON_ABIS check in EAPI >=4. + [[ "${EAPI}" =~ ^(0|1|2|3)?$ ]] || continue new_PYTHON_ABIS="" RESTRICT_PYTHON_ABIS="$(get_RESTRICT_PYTHON_ABIS "${CATEGORY}" "${PN}" "${SLOT}")" USE_PYTHON="$(get_USE_PYTHON "${CATEGORY}" "${PN}" "${SLOT}")" |