diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-27 22:12:21 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-27 22:12:21 +0000 |
| commit | 47cf97ad6badb4cc0912447d89a7ef091926a5fe (patch) | |
| tree | bafaa07b807067b7910587f4abf1f5162e76ea1e | |
| parent | 109e652902bfc8f4408dfb4ea4239a3c7c26ee0a (diff) | |
| download | portage-47cf97ad6badb4cc0912447d89a7ef091926a5fe.tar.gz portage-47cf97ad6badb4cc0912447d89a7ef091926a5fe.tar.bz2 portage-47cf97ad6badb4cc0912447d89a7ef091926a5fe.zip | |
Just use ${PN} instead of catpkgsplit().
svn path=/main/branches/2.1.2/; revision=8717
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 2 insertions, 3 deletions
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. |