diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-13 19:24:04 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-13 19:24:04 -0700 |
| commit | a10fea0231db16dd8bbb5384c060844a20e9ef33 (patch) | |
| tree | a0d597aef058ebe2952f9810265fb0857b0f8ef8 | |
| parent | 482c3de43f4af8e4ca835fe4febabe0415ad3f8f (diff) | |
| download | portage-a10fea0231db16dd8bbb5384c060844a20e9ef33.tar.gz portage-a10fea0231db16dd8bbb5384c060844a20e9ef33.tar.bz2 portage-a10fea0231db16dd8bbb5384c060844a20e9ef33.zip | |
Refactor FEATURES=test USE logic.v2.2.0_alpha128
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index bb0a7c1c4..c1630cbc1 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1467,9 +1467,11 @@ class config(object): not hasattr(self, "_ebuild_force_test_msg_shown"): self._ebuild_force_test_msg_shown = True writemsg(_("Forcing test.\n"), noiselevel=-1) - if "test" in self.features and \ - ("test" in explicit_iuse or iuse_implicit_match("test")): - if "test" in self.usemask and not ebuild_force_test: + + if "test" in explicit_iuse or iuse_implicit_match("test"): + if "test" not in self.features: + use.discard("test") + elif "test" in self.usemask and not ebuild_force_test: # "test" is in IUSE and USE=test is masked, so execution # of src_test() probably is not reliable. Therefore, # temporarily disable FEATURES=test just for this package. @@ -1481,11 +1483,6 @@ 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 \ |