diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:15:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:15:23 +0000 |
| commit | 6193f8959a4ec6c32fc6ddad626431779a842e7d (patch) | |
| tree | 32d10c0d1f7a8ba7320f842d3e1287f660b0606c /pym | |
| parent | 87b4012df99d0107e078d552a3883a94384bf7c1 (diff) | |
| download | portage-6193f8959a4ec6c32fc6ddad626431779a842e7d.tar.gz portage-6193f8959a4ec6c32fc6ddad626431779a842e7d.tar.bz2 portage-6193f8959a4ec6c32fc6ddad626431779a842e7d.zip | |
Fix getmaskingstatus() so that it doesn't inappropriately return a
'missing keyword' mask is some cases when the user has ** in package.keywords.
Thanks to Raúl Porcel <armin76@g.o> for reporting. (trunk r12696)
svn path=/main/branches/2.1.6/; revision=12953
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 8775b87aa..e6bd95259 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7194,9 +7194,13 @@ def getmaskingstatus(mycpv, settings=None, portdb=None): kmask = "missing" - for keyword in pgroups: - if keyword in mygroups: - kmask=None + if '**' in pgroups: + kmask = None + else: + for keyword in pgroups: + if keyword in mygroups: + kmask = None + break if kmask: fallback = None |