From 3502de89b0db26f98ae6c975c48666d8f389c824 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 14 Apr 2008 00:09:22 +0000 Subject: [PATCH] Fix some more broken logic inside WorldSet.load(). svn path=/main/trunk/; revision=9882 --- pym/portage/sets/files.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) -- 2.26.2