From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 3 Jul 2008 03:49:06 +0000 (-0000)
Subject: Move post ebuild phase code (originally from spawnebuild) from
X-Git-Tag: v2.2_rc2~237
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2c6e83b630dcc51305879ce176077579dbc554a0;p=portage.git

Move post ebuild phase code (originally from spawnebuild) from
EbuildExecuter.execute() to EbuildPhase._set_returncode().

svn path=/main/trunk/; revision=10899
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e46a8a124..f5532705b 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1863,12 +1863,6 @@ class EbuildExecuter(SlotObject):
 				self.schedule()
 				retval = ebuild_phase.poll()
 
-			portage._post_phase_userpriv_perms(settings)
-			if mydo == "install":
-				portage._check_build_log(settings)
-				if retval == os.EX_OK:
-					retval = portage._post_src_install_checks(settings)
-
 			if retval != os.EX_OK:
 				return retval
 
@@ -1993,6 +1987,14 @@ class EbuildPhase(SubProcess):
 			for l in wrap(msg, 72):
 				eerror(l, phase=self.phase, key=self.pkg.cpv)
 
+		returncode = self.returncode
+		settings = self.settings
+		portage._post_phase_userpriv_perms(settings)
+		if self.phase == "install":
+			portage._check_build_log(settings)
+			if returncode == os.EX_OK:
+				returncode = portage._post_src_install_checks(settings)
+
 class EbuildBinpkg(Task):
 	"""
 	This assumes that src_install() has successfully completed.