summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-18 22:27:15 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-18 22:27:15 +0000
commitbac9c28a169cc07e14b7d73495a2f701d50f3d2c (patch)
tree1bb0d9afc490d7a6a5e14f931d9fb4aab43cf9e0 /pym
parent6e17f4f915e3fbd57513fa29ed15cb117aeef6c4 (diff)
downloadportage-bac9c28a169cc07e14b7d73495a2f701d50f3d2c.tar.gz
portage-bac9c28a169cc07e14b7d73495a2f701d50f3d2c.tar.bz2
portage-bac9c28a169cc07e14b7d73495a2f701d50f3d2c.zip
Tweak vardbapi.aux_get() cache logic a bit.
svn path=/main/trunk/; revision=10360
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/dbapi/vartree.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8506a23e4..041c60a16 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -615,6 +615,8 @@ class vardbapi(dbapi):
mydata = {}
cache_valid = False
cache_incomplete = False
+ cache_mtime = None
+ metadata = None
if pkg_data:
cache_mtime, metadata = pkg_data
cache_valid = cache_mtime == mydir_mtime
@@ -638,7 +640,7 @@ class vardbapi(dbapi):
mydata[k] = v
if not cache_valid or cache_incomplete:
cache_data = {}
- if cache_incomplete:
+ if cache_valid and metadata:
cache_data.update(metadata)
for aux_key in cache_these:
cache_data[aux_key] = mydata[aux_key]