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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 8775b87aac78b1a122e9e2fca651d948ab3e9430..e6bd952592e818bf0200f8289f9f17fd5ae8dd43 100644 (file)
--- 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