diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-18 07:09:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-18 07:09:00 +0000 |
| commit | 2af5c01beb46ad750ce01094806bd376fcd9a36d (patch) | |
| tree | 5a7994541b166338e77e82e5c8419abe9dbf11f8 | |
| parent | 11e10ec824550554651409c089ea1095449cb672 (diff) | |
| download | portage-2af5c01beb46ad750ce01094806bd376fcd9a36d.tar.gz portage-2af5c01beb46ad750ce01094806bd376fcd9a36d.tar.bz2 portage-2af5c01beb46ad750ce01094806bd376fcd9a36d.zip | |
Include masked flags in PORTAGE_IUSE to avoid more false positives
in the useq() IUSE check.
svn path=/main/trunk/; revision=8949
| -rw-r--r-- | pym/portage/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1cdbda2c8..f0f80c3f0 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2391,6 +2391,7 @@ class config(object): # # * 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: @@ -2410,9 +2411,9 @@ class config(object): 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: |