diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-16 10:24:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-16 10:24:43 +0000 |
| commit | 589bde2742fb7d0502c2e6a56e306bfdd7423c86 (patch) | |
| tree | 38374c86f1b653094c9d878bafa6eba86a213d2e | |
| parent | 261e424d52cebddff4648cd1e87cdb7945821ddb (diff) | |
| download | portage-589bde2742fb7d0502c2e6a56e306bfdd7423c86.tar.gz portage-589bde2742fb7d0502c2e6a56e306bfdd7423c86.tar.bz2 portage-589bde2742fb7d0502c2e6a56e306bfdd7423c86.zip | |
Re-enable vardbapi.cpv_all() cache now that bug #223417 is solved.
svn path=/main/trunk/; revision=10661
| -rw-r--r-- | pym/_emerge/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
2 files changed, 2 insertions, 2 deletions
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() |