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 9c799bbec1575c22e9527bcec78ff1d5bbdd97d5..05f188d87d122a8fba493829e5642c0078ced93d 100644 (file)
--- 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):