* 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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8e51a1591a133ac39e4bc9d8123ce0f96c809548..ef5da58412c037b71b889e136e688ed7bcea97c1 100644 (file)
--- 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