summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-14 00:09:22 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-14 00:09:22 +0000
commit3502de89b0db26f98ae6c975c48666d8f389c824 (patch)
tree2047b210a9ae64a919da65c19a91bb3a126c7e30
parent4fceedd88f5ebc30004e59658d58b007e18189ee (diff)
downloadportage-3502de89b0db26f98ae6c975c48666d8f389c824.tar.gz
portage-3502de89b0db26f98ae6c975c48666d8f389c824.tar.bz2
portage-3502de89b0db26f98ae6c975c48666d8f389c824.zip
Fix some more broken logic inside WorldSet.load().
svn path=/main/trunk/; revision=9882
-rw-r--r--pym/portage/sets/files.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index f08a7d423..3fe397c5c 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -207,11 +207,13 @@ class WorldSet(EditablePackageSet):
atoms = data.keys()
self._mtime = mtime
atoms_changed = True
+ else:
+ atoms.extend(self._atoms)
try:
mtime = os.stat(self._filename2).st_mtime
except (OSError, IOError):
mtime = None
- if (not self._loaded or self._mtime2 != mtime or atoms_changed):
+ if (not self._loaded or self._mtime2 != mtime):
try:
data, errors = self.loader2.load()
for fname in errors:
@@ -225,6 +227,8 @@ class WorldSet(EditablePackageSet):
nonatoms = data.keys()
self._mtime2 = mtime
atoms_changed = True
+ else:
+ nonatoms.extend(self._nonatoms)
if atoms_changed:
self._setAtoms(atoms+nonatoms)