From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Mar 2009 00:57:29 +0000 (-0000)
Subject: Use a separate if/then to group boolean or'd expressions together, rather
X-Git-Tag: v2.2_rc27~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4aa2f3a510c829b5a34a3fab1feae306c437fbce;p=portage.git

Use a separate if/then to group boolean or'd expressions together, rather
than a subshell.

svn path=/main/trunk/; revision=13149
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f548a8f05..79db02cf3 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1862,12 +1862,11 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm depend && \
 	unset PORTAGE_SANDBOX_ON
 fi
 
-if ! hasq "$EBUILD_PHASE" clean cleanrm && \
-	(
-		hasq ${EBUILD_PHASE} depend || \
-		[[ ! -f $T/environment || -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
-		hasq noauto ${FEATURES}
-	) ; then
+if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
+if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \
+	-f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
+	hasq noauto $FEATURES ; then
+
 	# The bashrcs get an opportunity here to set aliases that will be expanded
 	# during sourcing of ebuilds and eclasses.
 	source_all_bashrcs
@@ -1907,6 +1906,7 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm && \
 	# This needs to be exported since prepstrip is a separate shell script.
 	[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED
 fi
+fi
 
 # Set default EAPI if necessary, so that most
 # code can simply assume that it's defined.