summaryrefslogtreecommitdiff
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-27 04:27:52 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-27 04:27:52 +0000
commitfa818bcf393933605f42e55b36b1653ce4fd4962 (patch)
tree8e11a49685d5d26eabafbd6df45591fc38e35719 /pym
parentRemove redundant EAPI assingment inside doebuild_environment(). (trunk r13176) (diff)
downloadportage-multirepo-fa818bcf393933605f42e55b36b1653ce4fd4962.tar.gz
portage-multirepo-fa818bcf393933605f42e55b36b1653ce4fd4962.tar.bz2
portage-multirepo-fa818bcf393933605f42e55b36b1653ce4fd4962.zip
Update code for removing noauto from FEATURES since config.features is a
set instead of a list now. (trunk r13178) svn path=/main/branches/2.1.6/; revision=13207
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 1e31ba8d..0d3a3d37 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14564,9 +14564,8 @@ def adjust_config(myopts, settings):
# Kill noauto as it will break merges otherwise.
if "noauto" in settings.features:
- while "noauto" in settings.features:
- settings.features.remove("noauto")
- settings["FEATURES"] = " ".join(settings.features)
+ settings.features.remove('noauto')
+ settings['FEATURES'] = ' '.join(sorted(settings.features))
settings.backup_changes("FEATURES")
CLEAN_DELAY = 5