From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Nov 2007 22:11:38 +0000 (-0000)
Subject: Just use ${PN} instead of catpkgsplit().
X-Git-Tag: v2.2_pre1~294
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b40d6f634c81410ea9043649026ebad796c26d22;p=portage.git

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 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.