diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-13 15:47:13 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-13 15:47:13 -0700 |
| commit | 6b19f71b39b6af43307abf20654511bace041217 (patch) | |
| tree | 27db4710e44a71f89b875714cc2ab556282b7c03 /pym/_emerge/depgraph.py | |
| parent | 34fd6700ba3ff1e18865322b37be31851570ab83 (diff) | |
| download | portage-6b19f71b39b6af43307abf20654511bace041217.tar.gz portage-6b19f71b39b6af43307abf20654511bace041217.tar.bz2 portage-6b19f71b39b6af43307abf20654511bace041217.zip | |
Bind FEATURES=-test to USE=-test for bug #373209.
Also, make options like emerge --newuse ignore the state of USE=test,
since users typically don't want to trigger a bunch of rebuilds when
they enable or disable FEATURES=test.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e388065fc..ac70d4315 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -29,6 +29,7 @@ from portage.exception import (InvalidAtom, InvalidDependString, from portage.output import colorize, create_color_func, \ darkgreen, green bad = create_color_func("BAD") +from portage.package.ebuild.config import _feature_flags from portage.package.ebuild.getmaskingstatus import \ _getmaskingstatus, _MaskReason from portage._sets import SETPREFIX @@ -1234,12 +1235,14 @@ class depgraph(object): cur_iuse).difference(forced_flags)) flags.update(orig_iuse.intersection(orig_use).symmetric_difference( cur_iuse.intersection(cur_use))) + flags.difference_update(_feature_flags) if flags: return flags elif changed_use or binpkg_respect_use: - flags = orig_iuse.intersection(orig_use).symmetric_difference( - cur_iuse.intersection(cur_use)) + flags = set(orig_iuse.intersection(orig_use).symmetric_difference( + cur_iuse.intersection(cur_use))) + flags.difference_update(_feature_flags) if flags: return flags return None |