diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-10-30 01:48:58 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-10-30 01:48:58 +0000 |
commit | ff6fc5d72cf7f47330ca7abf06d9a3d04472f8c4 (patch) | |
tree | f84174e370e307d2b11fd48bbdd5954d07592e84 | |
parent | d692c56e2bb94ccbfae16c42212a4fe10b3223be (diff) | |
download | portage-ff6fc5d72cf7f47330ca7abf06d9a3d04472f8c4.tar.gz portage-ff6fc5d72cf7f47330ca7abf06d9a3d04472f8c4.tar.bz2 portage-ff6fc5d72cf7f47330ca7abf06d9a3d04472f8c4.zip |
For getmaskingstatus messages, don't assume ARCH is a valid keyword, since that assumption is not necessarily correct for operating systems other than Linux. Thanks to Diego Pettenò for reporting.
svn path=/main/trunk/; revision=4879
-rw-r--r-- | pym/portage.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index f527ad826..c20b44a0c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3958,6 +3958,10 @@ def getmaskingstatus(mycpv, settings=None, portdb=None): mygroups = mygroups.split() pgroups = settings["ACCEPT_KEYWORDS"].split() myarch = settings["ARCH"] + if pgroups and myarch not in pgroups: + """For operating systems other than Linux, ARCH is not necessarily a + valid keyword.""" + myarch = pgroups[0].lstrip("~") pkgdict = settings.pkeywordsdict cp = dep_getkey(mycpv) |