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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-04-30 07:00:23 +0000 (Thu, 30 Apr 2009)
New Revision: 13470

Modified:
   main/branches/2.1.6/bin/ebuild.sh
   main/branches/2.1.6/bin/isolated-functions.sh
Log:
Move the ebuild sourcing code into a new _source_ebuild() function.
(trunk r13299)

Modified: main/branches/2.1.6/bin/ebuild.sh
===================================================================
--- main/branches/2.1.6/bin/ebuild.sh	2009-04-30 07:00:12 UTC (rev 13469)
+++ main/branches/2.1.6/bin/ebuild.sh	2009-04-30 07:00:23 UTC (rev 13470)
@@ -1802,11 +1802,7 @@
 	unset PORTAGE_SANDBOX_ON
 fi
 
-if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
-if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \
-	-f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
-	hasq noauto $FEATURES ; then
-
+_source_ebuild() {
 	# The bashrcs get an opportunity here to set aliases that will be expanded
 	# during sourcing of ebuilds and eclasses.
 	source_all_bashrcs
@@ -1845,8 +1841,15 @@
 
 	# This needs to be exported since prepstrip is a separate shell script.
 	[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED
+}
+
+if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
+	if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \
+		-f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
+		hasq noauto $FEATURES ; then
+		_source_ebuild
+	fi
 fi
-fi
 
 # Set default EAPI if necessary, so that most
 # code can simply assume that it's defined.

Modified: main/branches/2.1.6/bin/isolated-functions.sh
===================================================================
--- main/branches/2.1.6/bin/isolated-functions.sh	2009-04-30 07:00:12 UTC (rev 13469)
+++ main/branches/2.1.6/bin/isolated-functions.sh	2009-04-30 07:00:23 UTC (rev 13470)
@@ -518,6 +518,7 @@
 			source_all_bashrcs ebuild_main \
 			ebuild_phase ebuild_phase_with_hooks \
 			_ebuild_arg_to_phase _ebuild_phase_funcs default \
+			_source_ebuild \
 			${QA_INTERCEPTORS}
 
 		# portage config variables and variables set directly by portage