aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2017-12-07 19:22:41 -0800
committerZac Medico <zmedico@gentoo.org>2017-12-07 19:29:49 -0800
commitfe09b49fd09f42b9b6956f6c299bd325c62f0e83 (patch)
tree3e01112c7792cfab5e93be86697bc09557a8b2f5
parentdepgraph: eval disjunctive build deps earlier (bug 639346) (diff)
downloadportage-fe09b49fd09f42b9b6956f6c299bd325c62f0e83.tar.gz
portage-fe09b49fd09f42b9b6956f6c299bd325c62f0e83.tar.bz2
portage-fe09b49fd09f42b9b6956f6c299bd325c62f0e83.zip
phase-helpers.sh: make use() tolerate missing IUSE for binary packages
IUSE_IMPLICIT makes this code vulnerable to profile changes, therefore it's risky to die for binary packages here.
-rw-r--r--bin/phase-helpers.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index c02257eb6..9b1f6adbe 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -194,7 +194,8 @@ use() {
elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE &&
-n $PORTAGE_INTERNAL_CALLER ]] ; then
if [[ ! $u =~ $PORTAGE_IUSE ]] ; then
- if [[ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]] ; then
+ if [[ ${EMERGE_FROM} != binary &&
+ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]] ; then
# This is only strict starting with EAPI 5, since implicit IUSE
# is not well defined for earlier EAPIs (see bug #449708).
die "USE Flag '${u}' not in IUSE for ${CATEGORY}/${PF}"