diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-01 00:04:45 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-01-01 00:04:45 +0000 |
| commit | 2355bb8f720e7ec50e35b92200f77aadbc88e168 (patch) | |
| tree | df5277a8b24d6bd17c8bceeb900632974ea00ed6 /python-updater | |
| parent | Fix a typo in python-updater man page (bug #347229). (diff) | |
| download | python-updater-2355bb8f720e7ec50e35b92200f77aadbc88e168.tar.gz python-updater-2355bb8f720e7ec50e35b92200f77aadbc88e168.tar.bz2 python-updater-2355bb8f720e7ec50e35b92200f77aadbc88e168.zip | |
Update PYTHON_ABIS check.
Diffstat (limited to 'python-updater')
| -rwxr-xr-x | python-updater | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/python-updater b/python-updater index a4f3c0c..f40f23f 100755 --- a/python-updater +++ b/python-updater @@ -476,9 +476,9 @@ fi for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do environment_file="${content/CONTENTS/environment.bz2}" - # Extract some variables. EAPI, PYTHON_ABIS and PYTHON_REQUESTED_ACTIVE_VERSION are optional. + # Extract some variables. SUPPORT_PYTHON_ABIS, 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 SUPPORT_PYTHON_ABIS "${environment_file}" get_vdb_variable PYTHON_ABIS "${environment_file}" get_vdb_variable PYTHON_REQUESTED_ACTIVE_VERSION "${environment_file}" @@ -537,9 +537,7 @@ for content in $(find ${PKG_DBDIR}/ -name CONTENTS | sort); do fi 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 + if [[ -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}")" |