| 1 |
Author: genone |
| 2 |
Date: 2008-09-28 17:01:58 +0000 (Sun, 28 Sep 2008) |
| 3 |
New Revision: 11582 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/sets/__init__.py |
| 7 |
Log: |
| 8 |
disable redefintion errors when updating the set definitions |
| 9 |
|
| 10 |
Modified: main/trunk/pym/portage/sets/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/portage/sets/__init__.py 2008-09-28 16:08:50 UTC (rev 11581) |
| 13 |
+++ main/trunk/pym/portage/sets/__init__.py 2008-09-28 17:01:58 UTC (rev 11582) |
| 14 |
@@ -53,11 +53,10 @@ |
| 15 |
return |
| 16 |
for k, v in options.items(): |
| 17 |
self.set(section, k, v) |
| 18 |
- self._parsed = False |
| 19 |
- self._parse() |
| 20 |
+ self._parse(update=True) |
| 21 |
|
| 22 |
- def _parse(self): |
| 23 |
- if self._parsed: |
| 24 |
+ def _parse(self, update=False): |
| 25 |
+ if self._parsed and not update: |
| 26 |
return |
| 27 |
for sname in self.sections(): |
| 28 |
# find classname for current section, default to file based sets |
| 29 |
@@ -87,7 +86,7 @@ |
| 30 |
self.errors.append("Configuration error in section '%s': %s" % (sname, str(e))) |
| 31 |
continue |
| 32 |
for x in newsets: |
| 33 |
- if x in self.psets: |
| 34 |
+ if x in self.psets and not update: |
| 35 |
self.errors.append("Redefinition of set '%s' (sections: '%s', '%s')" % (x, self.psets[x].creator, sname)) |
| 36 |
newsets[x].creator = sname |
| 37 |
if self.has_option(sname, "world-candidate") and not self.getboolean(sname, "world-candidate"): |
| 38 |
@@ -101,7 +100,7 @@ |
| 39 |
setname = self.get(sname, "name") |
| 40 |
except NoOptionError: |
| 41 |
setname = sname |
| 42 |
- if setname in self.psets: |
| 43 |
+ if setname in self.psets and not update: |
| 44 |
self.errors.append("Redefinition of set '%s' (sections: '%s', '%s')" % (setname, self.psets[setname].creator, sname)) |
| 45 |
if hasattr(setclass, "singleBuilder"): |
| 46 |
try: |
Archives