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 1e31ba8d2f0556836ae881714e5f947399a7429d..0d3a3d378803a5e7bb40c7a29f0c2eaa1c710f5d 100644 (file)
--- 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