summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>2011-12-25 00:16:42 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>2011-12-25 00:16:42 +0000
commitd7051d71d8f553097f094aa6d486a2cee034e35a (patch)
treec92afbedf701f455e0a384beeeb9323817c47383
parentCheck Bash version. (diff)
downloadpython-updater-d7051d71d8f553097f094aa6d486a2cee034e35a.tar.gz
python-updater-d7051d71d8f553097f094aa6d486a2cee034e35a.tar.bz2
python-updater-d7051d71d8f553097f094aa6d486a2cee034e35a.zip
Support PYTHON_RESTRICTED_ABIS in PYTHON_ABIS check.
-rwxr-xr-xpython-updater19
1 files changed, 9 insertions, 10 deletions
diff --git a/python-updater b/python-updater
index 600b327..8520e8c 100755
--- a/python-updater
+++ b/python-updater
@@ -744,21 +744,20 @@ for contents_file in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do
if [[ CHECK_PYTHON_ABIS -ne 0 ]]; then
if [[ -n "${PYTHON_MULTIPLE_ABIS}" || -n "${SUPPORT_PYTHON_ABIS}" ]]; then
new_PYTHON_ABIS=""
- RESTRICT_PYTHON_ABIS="$(get_ebuild_variable "${CATEGORY}" "${PN}" "${SLOT}" "${RESTRICT_PYTHON_ABIS}")"
+ PYTHON_RESTRICTED_ABIS="$(get_ebuild_variable "${CATEGORY}" "${PN}" "${SLOT}" PYTHON_RESTRICTED_ABIS)"
+ RESTRICT_PYTHON_ABIS="$(get_ebuild_variable "${CATEGORY}" "${PN}" "${SLOT}" RESTRICT_PYTHON_ABIS)"
+ if [[ -z "${PYTHON_RESTRICTED_ABIS}" && -n "${RESTRICT_PYTHON_ABIS}" ]]; then
+ PYTHON_RESTRICTED_ABIS="${RESTRICT_PYTHON_ABIS}"
+ fi
USE_PYTHON="$(get_USE_PYTHON "${CATEGORY}" "${PN}" "${SLOT}")"
for PYTHON_ABI in ${USE_PYTHON}; do
- support_ABI="1"
- for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
- if check_python_abi_matching "${PYTHON_ABI}" "${restricted_ABI}"; then
- support_ABI="0"
- break
- fi
- done
- [[ "${support_ABI}" == "1" ]] && new_PYTHON_ABIS+="${new_PYTHON_ABIS:+ }${PYTHON_ABI}"
+ if ! check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${PYTHON_RESTRICTED_ABIS}"; then
+ new_PYTHON_ABIS+="${new_PYTHON_ABIS:+ }${PYTHON_ABI}"
+ fi
done
eindent && eindent
veinfo 3 "Requested ABIs: \"${USE_PYTHON}\""
- veinfo 3 "Restricted ABIs: \"${RESTRICT_PYTHON_ABIS}\""
+ veinfo 3 "Restricted ABIs: \"${PYTHON_RESTRICTED_ABIS}\""
veinfo 3 "Previously enabled ABIs: \"${PYTHON_ABIS}\""
veinfo 3 "Newly enabled ABIs: \"${new_PYTHON_ABIS}\""
eoutdent && eoutdent