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 83d8178fcd2d6b7c620dd71708d11ca399a8f1f5..b26f83532381380b3115fed9a4e246439379c158 100644 (file)
--- 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")