| 1 |
Author: zmedico |
| 2 |
Date: 2009-03-26 18:55:11 +0000 (Thu, 26 Mar 2009) |
| 3 |
New Revision: 13189 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
In config.regenerate(), always synchronize self.features with self['FEATURES']. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/__init__.py 2009-03-26 18:41:10 UTC (rev 13188) |
| 14 |
+++ main/trunk/pym/portage/__init__.py 2009-03-26 18:55:11 UTC (rev 13189) |
| 15 |
@@ -2809,10 +2809,12 @@ |
| 16 |
continue |
| 17 |
myflags.add(var_lower + "_" + x) |
| 18 |
|
| 19 |
- if not hasattr(self, "features"): |
| 20 |
- self.features = set( |
| 21 |
- self.configlist[-1].get("FEATURES","").split()) |
| 22 |
- self["FEATURES"] = " ".join(self.features) |
| 23 |
+ if hasattr(self, "features"): |
| 24 |
+ self.features.clear() |
| 25 |
+ else: |
| 26 |
+ self.features = set() |
| 27 |
+ self.features.update(self.configlist[-1].get('FEATURES', '').split()) |
| 28 |
+ self['FEATURES'] = ' '.join(sorted(self.features)) |
| 29 |
|
| 30 |
myflags.update(self.useforce) |
| 31 |
arch = self.configdict["defaults"].get("ARCH") |
Archives