commit: d0102f790d48ba22877d8ca0d0c0698e54154efb
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:36:59 2019 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:36:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0102f79
Fix leftover issues from merge commit
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
bin/phase-functions.sh | 2 --
bin/phase-helpers.sh | 5 +++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index f98d78f8a..e6c8bc360 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -578,8 +578,6 @@ __dyn_test() {
SANDBOX_PREDICT=${save_sp}
fi
- done
-
trap - SIGINT SIGQUIT
}
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 0a326b7d9..20336b310 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -239,8 +239,8 @@ use() {
# a full profile with IUSE_IMPLICIT and stuff (see bug #456830).
elif declare -f ___in_portage_iuse >/dev/null &&
[[ -n ${EBUILD_PHASE} && -n ${PORTAGE_INTERNAL_CALLER} ]] ; then
- if ( [[ ! " ${FEATURES} " == *" force-multilib "* && $u ==
multilib ]] && \
- if ! ___in_portage_iuse "${u}"; then
+ if ! ___in_portage_iuse "${u}" ]]; then
+ if [[ ! " ${FEATURES} " == *" force-multilib "* && $u ==
multilib ]] ; 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
@@ -250,6 +250,7 @@ use() {
eqawarn "QA Notice: USE Flag '${u}' not" \
"in IUSE for ${CATEGORY}/${PF}"
fi
+ fi
fi
local IFS=$' \t\n' prev_shopts=$- ret
