From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 16 Jun 2008 10:24:43 +0000 (-0000)
Subject: Re-enable vardbapi.cpv_all() cache now that bug #223417 is solved.
X-Git-Tag: v2.2_rc1~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=589bde2742fb7d0502c2e6a56e306bfdd7423c86;p=portage.git

Re-enable vardbapi.cpv_all() cache now that bug #223417 is solved.

svn path=/main/trunk/; revision=10661
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bc34faf77..efe746597 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1005,7 +1005,7 @@ class FakeVartree(portage.vartree):
 				vdb_lock = portage.locks.lockdir(vdb_path)
 			real_dbapi = real_vartree.dbapi
 			slot_counters = {}
-			for cpv in real_dbapi.cpv_all(use_cache=0):
+			for cpv in real_dbapi.cpv_all():
 				cache_key = ("installed", self.root, cpv, "nomerge")
 				pkg = self._pkg_cache.get(cache_key)
 				if pkg is not None:
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 7b08107ec..2f88cd1aa 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -136,7 +136,7 @@ class LinkageMap(object):
 		libs = {}
 		obj_properties = {}
 		lines = []
-		for cpv in self._dbapi.cpv_all(use_cache=0):
+		for cpv in self._dbapi.cpv_all():
 			lines += self._dbapi.aux_get(cpv, ["NEEDED.ELF.2"])[0].split('\n')
 		# Cache NEEDED.* files avoid doing excessive IO for every rebuild.
 		self._dbapi.flush_cache()