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 bc34faf77656ca07ac6505acdf99ddf50722432b..efe74659780f2a98e4be53b9189d280e4214c0d2 100644 (file)
--- 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 7b08107ecbc1e8b76375283b3234f4b8e628492e..2f88cd1aa43dba0a177b28ffe8f8220952efb906 100644 (file)
--- 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()