From 2f62e2e4429817e5bfa21742fecf6357f21981b3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 18 Dec 2007 07:11:50 +0000 Subject: Include masked flags in PORTAGE_IUSE to avoid more false positives in the useq() IUSE check. (trunk r8949) svn path=/main/branches/2.1.2/; revision=8950 --- pym/portage.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 254c35d64..36ca0db5c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -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: -- cgit v1.2.3-1-g7c22