summaryrefslogtreecommitdiffstats
path: root/pym/portage/package/ebuild/config.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-13 15:47:13 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-13 15:47:13 -0700
commit6b19f71b39b6af43307abf20654511bace041217 (patch)
tree27db4710e44a71f89b875714cc2ab556282b7c03 /pym/portage/package/ebuild/config.py
parent34fd6700ba3ff1e18865322b37be31851570ab83 (diff)
downloadportage-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/portage/package/ebuild/config.py')
-rw-r--r--pym/portage/package/ebuild/config.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 6ca1cb5b8..bb0a7c1c4 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -60,6 +60,8 @@ from portage.package.ebuild._config.helper import ordered_by_atom_specificity, p
if sys.hexversion >= 0x3000000:
basestring = str
+_feature_flags = frozenset(["test"])
+
def autouse(myvartree, use_cache=1, mysettings=None):
warnings.warn("portage.autouse() is deprecated",
DeprecationWarning, stacklevel=2)
@@ -1479,6 +1481,11 @@ class config(object):
if ebuild_force_test and "test" in self.usemask:
self.usemask = \
frozenset(x for x in self.usemask if x != "test")
+ elif "test" in explicit_iuse or iuse_implicit_match("test"):
+ if "test" in self.usemask or "test" not in self.features:
+ use.discard("test")
+ elif "test" in self.features:
+ use.add("test")
# Allow _* flags from USE_EXPAND wildcards to pass through here.
use.difference_update([x for x in use \