Include masked flags in PORTAGE_IUSE to avoid more false positives
authorZac Medico <zmedico@gentoo.org>
Tue, 18 Dec 2007 07:11:50 +0000 (07:11 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 18 Dec 2007 07:11:50 +0000 (07:11 -0000)
in the useq() IUSE check. (trunk r8949)

svn path=/main/branches/2.1.2/; revision=8950

pym/portage.py

index 254c35d64453a6de896423d8163c221922e20847..36ca0db5c2d66242aa198156431186799c25c432 100644 (file)
@@ -2372,6 +2372,7 @@ class config:
                #
                #  * Flags derived from ARCH
                #  * Flags derived from USE_EXPAND_HIDDEN variables
+               #  * Masked flags, such as those from {,package}use.mask
                #  * Forced flags, such as those from {,package}use.force
 
                if self.mycpv:
@@ -2391,9 +2392,9 @@ class config:
                                        if use_expand_hidden.match(x):
                                                iuse_implicit.add(x)
 
-                       # Flags that have been forced.
-                       iuse_implicit.update(x for x in self.useforce \
-                               if x not in self.usemask)
+                       # Flags that have been masked or forced.
+                       iuse_implicit.update(self.usemask)
+                       iuse_implicit.update(self.useforce)
 
                        iuse_grep = iuse_implicit.copy()
                        if use_expand_hidden_raw: