summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 980011f0c..a55f7237b 100644
--- 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.