[gentoo-commits] portage r13166 - main/branches/2.1.6/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-03-23 02:22:21 +0000 (Mon, 23 Mar 2009)
New Revision: 13166

Modified:
   main/branches/2.1.6/bin/ebuild.sh
Log:
Use a separate if/then to group boolean or'd expressions together, rather
than a subshell. (trunk r13149)

Modified: main/branches/2.1.6/bin/ebuild.sh
===================================================================
--- main/branches/2.1.6/bin/ebuild.sh	2009-03-23 02:22:06 UTC (rev 13165)
+++ main/branches/2.1.6/bin/ebuild.sh	2009-03-23 02:22:21 UTC (rev 13166)
@@ -1862,12 +1862,11 @@
 	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 @@
 	# 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.