summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-28 22:35:30 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-28 22:35:30 +0000
commitf7af2af3bcf3be308dfebb99fbc5b14b1ba53ab3 (patch)
treefa8a9777f47b043b51e463a7df16676d784f5901
parent5ba3d0a039ef9c56b63d15075bdf27a43d2883c2 (diff)
downloadportage-f7af2af3bcf3be308dfebb99fbc5b14b1ba53ab3.tar.gz
portage-f7af2af3bcf3be308dfebb99fbc5b14b1ba53ab3.tar.bz2
portage-f7af2af3bcf3be308dfebb99fbc5b14b1ba53ab3.zip
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
-rw-r--r--pym/portage/__init__.py6
1 files changed, 0 insertions, 6 deletions
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):