From 705ef026a8ffd0528de58ac4da7889022bee9741 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 1 Aug 2008 22:22:29 +0000 Subject: * Add INHERITED to vardbapi._aux_cache_keys since Package.metadata_keys also includes this one now. * Fix pull_me calculation inside vardbapi.aux_get() so that it correctly subtracts _mtime_ from the list of keys to pull. svn path=/main/trunk/; revision=11315 --- pym/portage/dbapi/vartree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 8e51a1591..ef5da5841 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -339,7 +339,7 @@ class vardbapi(dbapi): self.vartree = vartree self._aux_cache_keys = set( ["CHOST", "COUNTER", "DEPEND", "DESCRIPTION", - "EAPI", "HOMEPAGE", "IUSE", "KEYWORDS", + "EAPI", "HOMEPAGE", "INHERITED", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", "repository", "RESTRICT" , "SLOT", "USE"]) self._aux_cache_obj = None @@ -772,7 +772,7 @@ class vardbapi(dbapi): cache_valid = cache_mtime == mydir_mtime if cache_valid: mydata.update(metadata) - pull_me.difference_update(metadata) + pull_me.difference_update(mydata) if pull_me: # pull any needed data and cache it -- cgit v1.2.3-1-g7c22