From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 8 Dec 2007 22:56:35 +0000 (-0000)
Subject: Do an EBUILD_EXIT_STATUS_FILE sanity check in spawnebuild()
X-Git-Tag: v2.2_pre1~207
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=901ceb3dd4247cc941fec353109bf06de4d2271e;p=portage.git

Do an EBUILD_EXIT_STATUS_FILE sanity check in spawnebuild()
where it spawns misc-functions.sh after the install phase.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 711355e01..c5ef5fb04 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3735,6 +3735,8 @@ def spawnebuild(mydo,actionmap,mysettings,debug,alwaysdep=0,logfile=None):
 				os.path.basename(MISC_SH_BINARY))
 			mycommand = " ".join([_shell_quote(misc_sh_binary),
 				"install_qa_check", "install_symlink_html_docs"])
+			_doebuild_exit_status_unlink(
+				mysettings.get("EBUILD_EXIT_STATUS_FILE"))
 			filter_calling_env_state = mysettings._filter_calling_env
 			if os.path.exists(os.path.join(mysettings["T"], "environment")):
 				mysettings._filter_calling_env = True
@@ -3743,7 +3745,14 @@ def spawnebuild(mydo,actionmap,mysettings,debug,alwaysdep=0,logfile=None):
 					logfile=logfile, **kwargs)
 			finally:
 				mysettings._filter_calling_env = filter_calling_env_state
-			if qa_retval:
+			msg = _doebuild_exit_status_check(mydo, mysettings)
+			if msg:
+				qa_retval = 1
+				from textwrap import wrap
+				from portage.elog.messages import eerror
+				for l in wrap(msg, 72):
+					eerror(l, phase=mydo, key=mysettings.mycpv)
+			if qa_retval != os.EX_OK:
 				writemsg("!!! install_qa_check failed; exiting.\n",
 					noiselevel=-1)
 			return qa_retval