summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-27 22:11:38 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-27 22:11:38 +0000
commitb40d6f634c81410ea9043649026ebad796c26d22 (patch)
tree4645ed0d13f9efe50c7f81ad4c60971bd37a9cb6
parent8c1d81ba0153abe7b8a4b460f4fc3728b6d152ff (diff)
downloadportage-b40d6f634c81410ea9043649026ebad796c26d22.tar.gz
portage-b40d6f634c81410ea9043649026ebad796c26d22.tar.bz2
portage-b40d6f634c81410ea9043649026ebad796c26d22.zip
Just use ${PN} instead of catpkgsplit().
svn path=/main/trunk/; revision=8716
-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.