Update code for removing noauto from FEATURES since config.features is a

set instead of a list now.

svn path=/main/trunk/; revision=13178

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f951a8a571475351fe730f0b536ed16c4b7f84bb..04695cf8ae110c9f4fbe52ceada9e12c697f5b8f 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14920,9 +14920,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