summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-11 20:20:25 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-11 20:20:25 +0000
commit210aacd80a6eb9987fe28198b0d73804dc882365 (patch)
tree9bddb0aa5e17695a9c60cbcd6e1255ccf67cf876
parent8785a08f1cf6845e6b84951f835d3fbb20acc0d3 (diff)
downloadportage-210aacd80a6eb9987fe28198b0d73804dc882365.tar.gz
portage-210aacd80a6eb9987fe28198b0d73804dc882365.tar.bz2
portage-210aacd80a6eb9987fe28198b0d73804dc882365.zip
Fix ebuild(1) so that src_configure is only called for EAPIs for which it
is supported. svn path=/main/trunk/; revision=11399
-rw-r--r--pym/portage/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index e06dd8dad..d5b1867fa 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4315,6 +4315,10 @@ def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0,
fd_pipes=fd_pipes, returnpid=returnpid)
if retval:
return retval
+
+ if mydo == "configure" and mysettings["EAPI"] in ("0", "1", "2_pre1"):
+ return os.EX_OK
+
kwargs = actionmap[mydo]["args"]
mysettings["EBUILD_PHASE"] = mydo
_doebuild_exit_status_unlink(
@@ -4660,6 +4664,8 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
if not eapi_is_supported(eapi):
# can't do anything with this.
raise portage.exception.UnsupportedAPIException(mycpv, eapi)
+ mysettings.pop("EAPI", None)
+ mysettings.configdict["pkg"]["EAPI"] = eapi
try:
mysettings["PORTAGE_RESTRICT"] = " ".join(flatten(
portage.dep.use_reduce(portage.dep.paren_reduce(