Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Zac Medico (zmedico)" <zmedico@g.o>
Subject: portage r9882 - main/trunk/pym/portage/sets
Date: Mon, 14 Apr 2008 00:09:23 +0000
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@g.o mailing list


Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
portage r9881 - main/trunk/pym/portage/sets
Next by thread:
portage r9883 - main/trunk/bin
Previous by date:
portage r9881 - main/trunk/pym/portage/sets
Next by date:
portage r9883 - main/trunk/bin


Updated Apr 28, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.