From a731c7d79183644e1bd1566b3677db66a8ca1b4e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Dec 2007 14:40:13 +0000 Subject: Fixes for logic related to FEATURES=test to USE=test mapping: * Add EBUILD_FORCE_TEST to the environment whitelist and filter it from the saved environment in save_ebuild_env(). * Tweak logic inside the ebuild command and config.regenerate() so that EBUILD_FORCE_TEST works even in odd cases like when USE=test is masked. * Only make FEATURES=test map to USE=test when "test" is actually in IUSE. * Remove USE=test from the set of implicit IUSE so that useq() calls in ebuild.sh properly generate a QA Notice when "test" is missing from IUSE. svn path=/main/trunk/; revision=9064 --- pym/portage/__init__.py | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 54c22326f..2c826a58a 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -870,8 +870,9 @@ class config(object): # in it's bashrc (causing major leakage). _environ_whitelist += [ "BASH_ENV", "BUILD_PREFIX", "D", - "DISTDIR", "DOC_SYMLINKS_DIR", "EBUILD_EXIT_STATUS_FILE", - "EBUILD", "EBUILD_PHASE", "ECLASSDIR", "ECLASS_DEPTH", "EMERGE_FROM", + "DISTDIR", "DOC_SYMLINKS_DIR", "EBUILD", + "EBUILD_EXIT_STATUS_FILE", "EBUILD_FORCE_TEST", + "EBUILD_PHASE", "ECLASSDIR", "ECLASS_DEPTH", "EMERGE_FROM", "FEATURES", "FILESDIR", "HOME", "PATH", "PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR", "PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST", @@ -1535,8 +1536,8 @@ class config(object): self[var] = "0" self.backup_changes(var) + # initialize self.features self.regenerate() - self.features = portage.util.unique_array(self["FEATURES"].split()) if local_config: self._accept_license = \ @@ -2316,19 +2317,34 @@ class config(object): myflags.update(self.useforce) + iuse = self.configdict["pkg"].get("IUSE","").split() + iuse = [ x.lstrip("+-") for x in iuse ] # FEATURES=test should imply USE=test - if "test" in self.configlist[-1].get("FEATURES","").split(): - myflags.add("test") - if self.get("EBUILD_FORCE_TEST") == "1": - self.usemask.discard("test") + if not hasattr(self, "features"): + self.features = list(sorted(set( + self.configlist[-1].get("FEATURES","").split()))) + self["FEATURES"] = " ".join(self.features) + if "test" in self.features and "test" in iuse: + ebuild_force_test = self.get("EBUILD_FORCE_TEST") == "1" + if ebuild_force_test and self.get("EBUILD_PHASE") == "test": + writemsg("Forcing test.\n", noiselevel=-1) + if "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. + self["FEATURES"] = " ".join(x for x in self.features \ + if x != "test") + myflags.discard("test") + else: + myflags.add("test") + if ebuild_force_test: + self.usemask.discard("test") usesplit = [ x for x in myflags if \ x not in self.usemask] # Use the calculated USE flags to regenerate the USE_EXPAND flags so # that they are consistent. - iuse = self.configdict["pkg"].get("IUSE","").split() - iuse = [ x.lstrip("+-") for x in iuse ] for var in use_expand: prefix = var.lower() + "_" prefix_len = len(prefix) @@ -2396,7 +2412,6 @@ class config(object): # * Masked flags, such as those from {,package}use.mask # * Forced flags, such as those from {,package}use.force # * build and bootstrap flags used by bootstrap.sh - # * The "test" flag that's enabled by FEATURES=test # Do this even when there's no package since setcpv() can # optimize away regenerate() calls. @@ -2425,7 +2440,6 @@ class config(object): # build and bootstrap flags used by bootstrap.sh iuse_implicit.add("build") iuse_implicit.add("bootstrap") - iuse_implicit.add("test") iuse_grep = iuse_implicit.copy() if use_expand_hidden_raw: -- cgit v1.2.3-1-g7c22