From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 24 Mar 2009 17:24:34 +0000 (-0000)
Subject: Update code for removing noauto from FEATURES since config.features is a
X-Git-Tag: v2.2_rc28~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4a1deee19e89cda930ef15cbe2d73984d7867cf;p=portage.git

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 f951a8a57..04695cf8a 100644
--- 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