Just use ${PN} instead of catpkgsplit().

svn path=/main/branches/2.1.2/; revision=8717

diff --git a/pym/portage.py b/pym/portage.py
index 507cc437f14782ef4a3d69903de9c415b4a8d24e..44ca818dc4b72bfc5c8b4804220084a38b51b4f1 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3931,9 +3931,8 @@ def _doebuild_exit_status_check(mydo, settings):
        Returns an error string if the shell appeared
        to exit unsuccessfully, None otherwise.
        """
-       if settings["ROOT"] == "/":
-               cat, pn, ver, rev = catpkgsplit(settings.mycpv)
-               if pn == "portage":
+       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.