Fix getmaskingstatus() so that it doesn't inappropriately return a
authorZac Medico <zmedico@gentoo.org>
Mon, 23 Feb 2009 17:31:40 +0000 (17:31 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 23 Feb 2009 17:31:40 +0000 (17:31 -0000)
'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

pym/portage/__init__.py

index 9f0982b0c9b692cb010773ed7d8cf633c55459ea..cf44ef92b2c2b9d2e7a0ed0e60d77a48e541951d 100644 (file)
@@ -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