From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 6 Sep 2010 07:19:10 +0000 (-0700)
Subject: Fix FakeVartree.sync() to remove stale packages from _pkg_cache.
X-Git-Tag: v2.2_rc76~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7900fad943674ac24c4dbd4e9f2ee0bb1960c7e2;p=portage.git

Fix FakeVartree.sync() to remove stale packages from _pkg_cache.
---

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 3d07af412..97675708b 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -131,12 +131,14 @@ class FakeVartree(vartree):
 		real_vardb = self._root_config.trees["vartree"].dbapi
 		current_cpv_set = frozenset(real_vardb.cpv_all())
 		pkg_vardb = self.dbapi
+		pkg_cache = self._pkg_cache
 		aux_get_history = self._aux_get_history
 
 		# Remove any packages that have been uninstalled.
 		for pkg in list(pkg_vardb):
 			if pkg.cpv not in current_cpv_set:
 				pkg_vardb.cpv_remove(pkg)
+				pkg_cache.pop(pkg, None)
 				aux_get_history.discard(pkg.cpv)
 
 		# Validate counters and timestamps.
@@ -157,6 +159,7 @@ class FakeVartree(vartree):
 				if counter != pkg.counter or \
 					mtime != pkg.mtime:
 					pkg_vardb.cpv_remove(pkg)
+					pkg_cache.pop(pkg, None)
 					aux_get_history.discard(pkg.cpv)
 					pkg = None