From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Mar 2009 04:31:36 +0000 (-0000)
Subject: In config.regenerate(), always synchronize self.features with self['FEATURES'].
X-Git-Tag: v2.1.6.11~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03ff7ade19d29a79a0212d3e87b39d5601f55b50;p=portage.git

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

svn path=/main/branches/2.1.6/; revision=13218
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 83d8178fc..b26f83532 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2799,10 +2799,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")