From f12d25bbcb0abae496bb38ffdd3ea042163bbdde Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 26 Sep 2008 21:40:55 +0000 Subject: Add PROPERTIES to all of the metadata caches. svn path=/main/trunk/; revision=11561 --- pym/_emerge/__init__.py | 2 +- pym/portage/dbapi/bintree.py | 5 +++-- pym/portage/dbapi/porttree.py | 2 +- pym/portage/dbapi/vartree.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index d68dd80a0..57101aae8 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1412,7 +1412,7 @@ class Package(Task): "CHOST", "COUNTER", "DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", - "repository", "RESTRICT", "SLOT", "USE", "_mtime_"] + "repository", "PROPERTIES", "RESTRICT", "SLOT", "USE", "_mtime_"] def __init__(self, **kwargs): Task.__init__(self, **kwargs) diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 59835c073..94fda67e5 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -32,7 +32,7 @@ class bindbapi(fakedbapi): # Selectively cache metadata in order to optimize dep matching. self._aux_cache_keys = set( ["CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS", - "LICENSE", "PDEPEND", "PROVIDE", + "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository", "RESTRICT", "SLOT", "USE"]) self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys) self._aux_cache = {} @@ -154,7 +154,7 @@ class binarytree(object): self._pkgindex_keys.update(["CPV", "MTIME", "SIZE"]) self._pkgindex_aux_keys = \ ["CHOST", "DEPEND", "DESCRIPTION", "EAPI", - "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", + "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository", "SLOT", "USE"] self._pkgindex_aux_keys = list(self._pkgindex_aux_keys) self._pkgindex_header_keys = set(["ACCEPT_KEYWORDS", "CBUILD", @@ -168,6 +168,7 @@ class binarytree(object): "LICENSE" : "", "PATH" : "", "PDEPEND" : "", + "PROPERTIES" : "", "PROVIDE" : "", "RDEPEND" : "", "RESTRICT": "", diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 2cc79b849..8d3700741 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -195,7 +195,7 @@ class portdbapi(dbapi): # Selectively cache metadata in order to optimize dep matching. self._aux_cache_keys = set( ["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE", - "PDEPEND", "PROVIDE", "RDEPEND", "repository", + "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository", "RESTRICT", "SLOT"]) # Repoman modifies _aux_cache_keys, so delay _aux_cache_slot_dict diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f5c0e2b17..becbacc17 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -637,7 +637,7 @@ class vardbapi(dbapi): self._aux_cache_keys = set( ["CHOST", "COUNTER", "DEPEND", "DESCRIPTION", "EAPI", "HOMEPAGE", "IUSE", "KEYWORDS", - "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", + "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository", "RESTRICT" , "SLOT", "USE"]) self._aux_cache_obj = None self._aux_cache_filename = os.path.join(self.root, -- cgit v1.2.3-1-g7c22