From: Zac Medico Date: Fri, 27 Mar 2009 04:27:52 +0000 (-0000) Subject: Update code for removing noauto from FEATURES since config.features is a X-Git-Tag: v2.1.6.11~20 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa818bcf393933605f42e55b36b1653ce4fd4962;p=portage.git 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 --- diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 1e31ba8d2..0d3a3d378 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