diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-08-01 22:22:29 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-08-01 22:22:29 +0000 |
commit | 705ef026a8ffd0528de58ac4da7889022bee9741 (patch) | |
tree | 32b6e3449621ebde41cb104d94e178526a74cab0 | |
parent | 97f866d3a76072745478f557390f203edc58d306 (diff) | |
download | portage-705ef026a8ffd0528de58ac4da7889022bee9741.tar.gz portage-705ef026a8ffd0528de58ac4da7889022bee9741.tar.bz2 portage-705ef026a8ffd0528de58ac4da7889022bee9741.zip |
* 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
-rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |