diff options
| -rwxr-xr-x | python-updater | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/python-updater b/python-updater index 79fe861..e38bbf6 100755 --- a/python-updater +++ b/python-updater @@ -564,8 +564,10 @@ fi for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do environment_file="${content/CONTENTS/environment.bz2}" - # Extract some variables. SUPPORT_PYTHON_ABIS, PYTHON_ABIS and PYTHON_REQUESTED_ACTIVE_VERSION are optional. + # Extract some variables. EAPI, PYTHON_MULTIPLE_ABIS/SUPPORT_PYTHON_ABIS, PYTHON_ABIS and PYTHON_REQUESTED_ACTIVE_VERSION are optional. get_vdb_variable PVR "${environment_file}" || die "Missing metadata in '${environment_file}' file. Manually reinstall corresponding package." + get_vdb_variable EAPI "${environment_file}" + get_vdb_variable PYTHON_MULTIPLE_ABIS "${environment_file}" get_vdb_variable SUPPORT_PYTHON_ABIS "${environment_file}" get_vdb_variable PYTHON_ABIS "${environment_file}" get_vdb_variable PYTHON_REQUESTED_ACTIVE_VERSION "${environment_file}" @@ -625,7 +627,9 @@ for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do fi if [[ CHECK_PYTHON_ABIS -ne 0 ]]; then - if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then + # Don't run PYTHON_ABIS check in EAPI >= 4-python. + [[ "${EAPI}" =~ ^(0|1|2|3|4)?$ ]] || continue + if [[ -n "${PYTHON_MULTIPLE_ABIS}" || -n "${SUPPORT_PYTHON_ABIS}" ]]; then new_PYTHON_ABIS="" RESTRICT_PYTHON_ABIS="$(get_RESTRICT_PYTHON_ABIS "${CATEGORY}" "${PN}" "${SLOT}")" USE_PYTHON="$(get_USE_PYTHON "${CATEGORY}" "${PN}" "${SLOT}")" |