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 a05063651fa31773ebac87f6beecbcf728d4d334..131b8d19d068b3494c5bf7efc3568735fa67c2a3 100644 (file)
--- 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")