1 |
Author: zmedico |
2 |
Date: 2008-04-14 00:09:22 +0000 (Mon, 14 Apr 2008) |
3 |
New Revision: 9882 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/sets/files.py |
7 |
Log: |
8 |
Fix some more broken logic inside WorldSet.load(). |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/portage/sets/files.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/portage/sets/files.py 2008-04-14 00:03:00 UTC (rev 9881) |
14 |
+++ main/trunk/pym/portage/sets/files.py 2008-04-14 00:09:22 UTC (rev 9882) |
15 |
@@ -207,11 +207,13 @@ |
16 |
atoms = data.keys() |
17 |
self._mtime = mtime |
18 |
atoms_changed = True |
19 |
+ else: |
20 |
+ atoms.extend(self._atoms) |
21 |
try: |
22 |
mtime = os.stat(self._filename2).st_mtime |
23 |
except (OSError, IOError): |
24 |
mtime = None |
25 |
- if (not self._loaded or self._mtime2 != mtime or atoms_changed): |
26 |
+ if (not self._loaded or self._mtime2 != mtime): |
27 |
try: |
28 |
data, errors = self.loader2.load() |
29 |
for fname in errors: |
30 |
@@ -225,6 +227,8 @@ |
31 |
nonatoms = data.keys() |
32 |
self._mtime2 = mtime |
33 |
atoms_changed = True |
34 |
+ else: |
35 |
+ nonatoms.extend(self._nonatoms) |
36 |
if atoms_changed: |
37 |
self._setAtoms(atoms+nonatoms) |
38 |
|
39 |
|
40 |
-- |
41 |
gentoo-commits@l.g.o mailing list |