From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 28 Nov 2007 22:35:30 +0000 (-0000)
Subject: Enable the EBUILD_EXIT_STATUS_FILE sanity check when portage is
X-Git-Tag: v2.2_pre1~286
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7af2af3bcf3be308dfebb99fbc5b14b1ba53ab3;p=portage.git

Enable the EBUILD_EXIT_STATUS_FILE sanity check when portage is
reinstalling itself since the check is reliable in this case now
that a temporary PORTAGE_BIN_PATH is created.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9c799bbec..05f188d87 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3978,12 +3978,6 @@ def _doebuild_exit_status_check(mydo, settings):
 	Returns an error string if the shell appeared
 	to exit unsuccessfully, None otherwise.
 	"""
-	if settings.get("ROOT") == "/" and \
-		settings.get("PN") == "portage":
-			# portage upgrade or downgrade invalidates this check
-			# since ebuild.sh portage version may differ from the
-			# current instance that is running in python.
-			return None
 	exit_status_file = settings.get("EBUILD_EXIT_STATUS_FILE")
 	if not exit_status_file or \
 		os.path.exists(exit_status_file):