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

svn path=/main/trunk/; revision=8716

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 980011f0c2956e499bd7289e3bac67ef59f076fd..a55f7237b5ea416bc9d1a9e363f1f3c0baf78af2 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3977,9 +3977,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.