[gentoo-commits] portage r11398 - in main/trunk: bin pym/_emerge

[gentoo-commits] portage r11398 - in main/trunk: bin pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-08-11 19:50:57 +0000 (Mon, 11 Aug 2008)
New Revision: 11398

Modified:
   main/trunk/bin/ebuild.sh
   main/trunk/pym/_emerge/__init__.py
Log:
Entirely disable the src_configure phase from the python side for EAPI values
for which it's not supported. This avoids pointless spawning of ebuild.sh and
also avoids having bashrc called during an invalid phase as reported by
Arfrever.


Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh	2008-08-11 06:52:45 UTC (rev 11397)
+++ main/trunk/bin/ebuild.sh	2008-08-11 19:50:57 UTC (rev 11398)
@@ -857,7 +857,6 @@
 }
 
 dyn_configure() {
-	hasq "$EAPI" 0 1 2_pre1 && return 0
 
 	if [[ $PORTAGE_BUILDDIR/.configured -nt $WORKDIR ]] ; then
 		vecho ">>> It appears that '$PF' is already configured; skipping."

Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-08-11 06:52:45 UTC (rev 11397)
+++ main/trunk/pym/_emerge/__init__.py	2008-08-11 19:50:57 UTC (rev 11398)
@@ -2657,7 +2657,13 @@
 
 		ebuild_phases = TaskSequence(scheduler=self.scheduler)
 
-		for phase in self._phases:
+		pkg = self.pkg
+		phases = self._phases
+		if pkg.metadata["EAPI"] in ("0", "1", "2_pre1"):
+			# skip src_configure
+			phases = phases[1:]
+
+		for phase in phases:
 			ebuild_phases.add(EbuildPhase(background=self.background,
 				pkg=self.pkg, phase=phase, scheduler=self.scheduler,
 				settings=self.settings, tree=self._tree))