diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-26 18:55:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-26 18:55:11 +0000 |
| commit | ca55df65b27dd77a9f0a841547386f61bc36e7e0 (patch) | |
| tree | 4201f224165dc8dfbce4af52348ea1b1a47f99cd | |
| parent | fea5dbe742543df98a5fec81f8c3364cbeb03fe3 (diff) | |
| download | portage-ca55df65b27dd77a9f0a841547386f61bc36e7e0.tar.gz portage-ca55df65b27dd77a9f0a841547386f61bc36e7e0.tar.bz2 portage-ca55df65b27dd77a9f0a841547386f61bc36e7e0.zip | |
In config.regenerate(), always synchronize self.features with self['FEATURES'].
svn path=/main/trunk/; revision=13189
| -rw-r--r-- | pym/portage/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
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") |