aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-21 04:13:09 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-21 04:13:09 -0700
commit13af7cb709711b00394e80b3a7a928a95133229f (patch)
tree31796dfc41386b1f2c1fa3a28d220035570eb19a /pym/portage/package/ebuild/prepare_build_dirs.py
parentWhen stacking incrementals in config.regenerate(), use a set to avoid (diff)
downloadportage-13af7cb709711b00394e80b3a7a928a95133229f.tar.gz
portage-13af7cb709711b00394e80b3a7a928a95133229f.tar.bz2
portage-13af7cb709711b00394e80b3a7a928a95133229f.zip
Add a wrapper around config.features that provides the following
enhancements: * The FEATURES variable is automatically synchronized upon modification. * Modifications result in a permanent override that will cause the change to propagate to the incremental stacking mechanism in config.regenerate(). This eliminates the need to call config.backup_changes() when FEATURES is modified, since any overrides are guaranteed to persist despite calls to config.reset(). This allows cleanup of all code that overrides FEATURES, and also allows config.regenerate() to stack FEATURES such that special cases are not needed for package.env handling inside config.setcpv().
Diffstat (limited to 'pym/portage/package/ebuild/prepare_build_dirs.py')
-rw-r--r--pym/portage/package/ebuild/prepare_build_dirs.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py
index 3792800ac..0ae60342f 100644
--- a/pym/portage/package/ebuild/prepare_build_dirs.py
+++ b/pym/portage/package/ebuild/prepare_build_dirs.py
@@ -235,7 +235,6 @@ def _prepare_features_dirs(mysettings):
if failure:
mysettings.features.remove(myfeature)
- mysettings['FEATURES'] = ' '.join(sorted(mysettings.features))
time.sleep(5)
def _prepare_workdir(mysettings):