From 03ff7ade19d29a79a0212d3e87b39d5601f55b50 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 27 Mar 2009 04:31:36 +0000 Subject: [PATCH] In config.regenerate(), always synchronize self.features with self['FEATURES']. (trunk r13189) svn path=/main/branches/2.1.6/; revision=13218 --- pym/portage/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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") -- 2.26.2