From 210aacd80a6eb9987fe28198b0d73804dc882365 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 11 Aug 2008 20:20:25 +0000 Subject: Fix ebuild(1) so that src_configure is only called for EAPIs for which it is supported. svn path=/main/trunk/; revision=11399 --- pym/portage/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pym') 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( -- cgit v1.2.3-1-g7c22