From 85ecff2a9d2c37bbddf7b630699642b34b3078ee Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Nov 2007 04:23:36 +0000 Subject: [PATCH] Synchronize vardbapi._aux_cache_keys with trunk. It's important at least to include RESTRICT since the depgraph uses that one and therefore it should be cached to improve performance. The others aren't strictly necessary at this time, but it's good to be in sync with trunk. svn path=/main/branches/2.1.2/; revision=8522 --- pym/portage.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 046277db4..5fc82faff 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5664,8 +5664,10 @@ class vardbapi(dbapi): if vartree is None: vartree = globals()["db"][root]["vartree"] self.vartree = vartree - self._aux_cache_keys = set(["SLOT", "COUNTER", "PROVIDE", "USE", - "IUSE", "DEPEND", "RDEPEND", "PDEPEND", "repository"]) + self._aux_cache_keys = set( + ["CHOST", "COUNTER", "DEPEND", "EAPI", "IUSE", "KEYWORDS", + "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", "NEEDED", + "repository", "RESTRICT" , "SLOT", "USE"]) self._aux_cache = None self._aux_cache_version = "1" self._aux_cache_filename = os.path.join(self.root, @@ -6019,7 +6021,8 @@ class vardbapi(dbapi): myd = myf.read() finally: myf.close() - myd = " ".join(myd.split()) + if x != "NEEDED": + myd = " ".join(myd.split()) except IOError: myd = "" if x == "EAPI" and not myd: -- 2.26.2