Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r9882 - main/trunk/pym/portage/sets
Date: Mon, 14 Apr 2008 00:09:26
Message-Id: E1JlCGB-0006pc-QC@stork.gentoo.org
Author: zmedico
Date: 2008-04-14 00:09:22 +0000 (Mon, 14 Apr 2008)
New Revision: 9882

Modified:
   main/trunk/pym/portage/sets/files.py
Log:
Fix some more broken logic inside WorldSet.load().


Modified: main/trunk/pym/portage/sets/files.py
===================================================================
--- main/trunk/pym/portage/sets/files.py	2008-04-14 00:03:00 UTC (rev 9881)
+++ main/trunk/pym/portage/sets/files.py	2008-04-14 00:09:22 UTC (rev 9882)
@@ -207,11 +207,13 @@
 			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 @@
 			nonatoms = data.keys()
 			self._mtime2 = mtime
 			atoms_changed = True
+		else:
+			nonatoms.extend(self._nonatoms)
 		if atoms_changed:
 			self._setAtoms(atoms+nonatoms)
 		

-- 
gentoo-commits@l.g.o mailing list