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

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 507cc437f..44ca818dc 100644
--- 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.