diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-27 04:31:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-27 04:31:36 +0000 |
| commit | 03ff7ade19d29a79a0212d3e87b39d5601f55b50 (patch) | |
| tree | dcab7edc4a7a0a57818d345544ac4eac17bb545b /pym | |
| parent | In config.setcpv(), clear out self.configdict["pkg"] to make sure that no (diff) | |
| download | portage-multirepo-03ff7ade19d29a79a0212d3e87b39d5601f55b50.tar.gz portage-multirepo-03ff7ade19d29a79a0212d3e87b39d5601f55b50.tar.bz2 portage-multirepo-03ff7ade19d29a79a0212d3e87b39d5601f55b50.zip | |
In config.regenerate(), always synchronize self.features with self['FEATURES'].
(trunk r13189)
svn path=/main/branches/2.1.6/; revision=13218
Diffstat (limited to 'pym')
| -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 83d8178f..b26f8353 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") |