From b40d6f634c81410ea9043649026ebad796c26d22 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 27 Nov 2007 22:11:38 +0000 Subject: [PATCH] Just use ${PN} instead of catpkgsplit(). svn path=/main/trunk/; revision=8716 --- pym/portage/__init__.py | 5 ++--- 1 file 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. -- 2.26.2