Allow the list of keys cached by the vardb to change without forcing a cache version...

svn path=/main/trunk/; revision=5405

diff --git a/pym/portage.py b/pym/portage.py
index 16d99a955dee8e97a897bdcd1035ed38d9b21183..f2b11876c646aae16cd2dbc71ab65226d9b548f7 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5047,6 +5047,10 @@ class vardbapi(dbapi):
                if pkg_data:
                        cache_mtime, metadata = pkg_data
                        cache_valid = cache_mtime == mydir_mtime
+                       if cache_valid and set(metadata) != self._aux_cache_keys:
+                               # Allow self._aux_cache_keys to change without a cache version
+                               # bump.
+                               cache_valid = False
                if cache_valid:
                        mydata.update(metadata)
                        pull_me = set(wants).difference(self._aux_cache_keys)