diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-30 18:43:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-30 18:43:21 -0700 |
| commit | 74c61b80af137fea93e5cbe7b59567812bb92d5c (patch) | |
| tree | d53515c1c5e7bc4f84780342c04c3a096af14313 /pym/portage/package/ebuild/config.py | |
| parent | d5333ba65e56666802ff82f7153f638da2b5b216 (diff) | |
| download | portage-74c61b80af137fea93e5cbe7b59567812bb92d5c.tar.gz portage-74c61b80af137fea93e5cbe7b59567812bb92d5c.tar.bz2 portage-74c61b80af137fea93e5cbe7b59567812bb92d5c.zip | |
Bug #326561 - Implement FEATURES=unknown-features-filter. This is not
enabled by default now, but it may be in the future, depending on feedback
from unknown-features-warn.
Diffstat (limited to 'pym/portage/package/ebuild/config.py')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index ab042a235..847ac1ccb 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -27,7 +27,7 @@ from portage import bsd_chflags, \ from portage.const import CACHE_PATH, \ DEPCACHE_PATH, INCREMENTALS, MAKE_CONF_FILE, \ MODULES_FILE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, \ - PRIVATE_PATH, PROFILE_PATH, SUPPORTED_FEATURES, USER_CONFIG_PATH, \ + PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, \ USER_VIRTUALS_FILE from portage.dbapi import dbapi from portage.dbapi.porttree import portdbapi @@ -1911,19 +1911,7 @@ class config(object): self.features = features_set(self) self.features._features.update(self.get('FEATURES', '').split()) self.features._sync_env_var() - - if 'unknown-features-warn' in self.features: - unknown_features = \ - self.features._features.difference(SUPPORTED_FEATURES) - if unknown_features: - unknown_features = \ - unknown_features.difference(self._unknown_features) - if unknown_features: - self._unknown_features.update(unknown_features) - writemsg_level(colorize("BAD", - _("FEATURES variable contains unknown value(s): %s") % \ - ", ".join(sorted(unknown_features))) \ - + "\n", noiselevel=-1) + self.features._validate() myflags.update(self.useforce) arch = self.configdict["defaults"].get("ARCH") |