diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-23 17:31:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-23 17:31:40 +0000 |
| commit | c4a86fe742fe7058d7dca837d969377d8fc1f925 (patch) | |
| tree | afc0245c006ad59fa13d2701bca5c63f1c7dca78 | |
| parent | a27654f6567e1b15368a19e1953b7c3cb863927d (diff) | |
| download | portage-c4a86fe742fe7058d7dca837d969377d8fc1f925.tar.gz portage-c4a86fe742fe7058d7dca837d969377d8fc1f925.tar.bz2 portage-c4a86fe742fe7058d7dca837d969377d8fc1f925.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.
svn path=/main/trunk/; revision=12696
| -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 9f0982b0c..cf44ef92b 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7207,9 +7207,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 |