From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 26 Mar 2009 18:55:11 +0000 (-0000)
Subject: In config.regenerate(), always synchronize self.features with self['FEATURES'].
X-Git-Tag: v2.2_rc28~10
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ca55df65b27dd77a9f0a841547386f61bc36e7e0;p=portage.git

In config.regenerate(), always synchronize self.features with self['FEATURES'].

svn path=/main/trunk/; revision=13189
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a05063651..131b8d19d 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2809,10 +2809,12 @@ class config(object):
 						continue
 					myflags.add(var_lower + "_" + x)
 
-		if not hasattr(self, "features"):
-			self.features = set(
-				self.configlist[-1].get("FEATURES","").split())
-		self["FEATURES"] = " ".join(self.features)
+		if hasattr(self, "features"):
+			self.features.clear()
+		else:
+			self.features = set()
+		self.features.update(self.configlist[-1].get('FEATURES', '').split())
+		self['FEATURES'] = ' '.join(sorted(self.features))
 
 		myflags.update(self.useforce)
 		arch = self.configdict["defaults"].get("ARCH")