* [gentoo-commits] portage r13149 - main/trunk/bin
@ 2009-03-23 0:57 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-03-23 0:57 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-03-23 00:57:29 +0000 (Mon, 23 Mar 2009)
New Revision: 13149
Modified:
main/trunk/bin/ebuild.sh
Log:
Use a separate if/then to group boolean or'd expressions together, rather
than a subshell.
Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh 2009-03-23 00:44:23 UTC (rev 13148)
+++ main/trunk/bin/ebuild.sh 2009-03-23 00:57:29 UTC (rev 13149)
@@ -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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-23 0:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-23 0:57 [gentoo-commits] portage r13149 - main/trunk/bin Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox