From 59d910bceb96d1c68687f3a10dbb5147063e6b02 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Tue, 30 Mar 2010 14:10:49 +0200 Subject: Add DEFINED_PHASES to the dbapi caches and _emerge.Package.metadata --- pym/portage/dbapi/bintree.py | 7 ++++--- pym/portage/dbapi/porttree.py | 2 +- pym/portage/dbapi/vartree.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'pym/portage') diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 610813f76..997d629a8 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -53,7 +53,7 @@ class bindbapi(fakedbapi): self._aux_cache_keys = set( ["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", - "RDEPEND", "repository", "RESTRICT", "SLOT", "USE"]) + "RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES"]) self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys) self._aux_cache = {} @@ -188,7 +188,7 @@ class binarytree(object): self._pkgindex_aux_keys = \ ["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES", - "PROVIDE", "RDEPEND", "repository", "SLOT", "USE"] + "PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES"] self._pkgindex_aux_keys = list(self._pkgindex_aux_keys) self._pkgindex_use_evaluated_keys = \ ("LICENSE", "RDEPEND", "DEPEND", @@ -212,7 +212,8 @@ class binarytree(object): "RDEPEND" : "", "RESTRICT": "", "SLOT" : "0", - "USE" : "" + "USE" : "", + "DEFINED_PHASES" : "" } self._pkgindex_inherited_keys = ["CHOST", "repository"] self._pkgindex_default_header_data = { diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 140a3bd80..fd7dbe6b7 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -402,7 +402,7 @@ class portdbapi(dbapi): self._aux_cache_keys = set( ["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository", - "RESTRICT", "SLOT"]) + "RESTRICT", "SLOT", "DEFINED_PHASES"]) self._aux_cache = {} self._broken_ebuilds = set() diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 38622df45..e6e42b9f9 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -848,7 +848,7 @@ class vardbapi(dbapi): ["BUILD_TIME", "CHOST", "COUNTER", "DEPEND", "DESCRIPTION", "EAPI", "HOMEPAGE", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", - "repository", "RESTRICT" , "SLOT", "USE"]) + "repository", "RESTRICT" , "SLOT", "USE", "DEFINED_PHASES"]) self._aux_cache_obj = None self._aux_cache_filename = os.path.join(self.root, CACHE_PATH, "vdb_metadata.pickle") -- cgit v1.2.3-1-g7c22