diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-18 04:23:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-18 04:23:36 +0000 |
| commit | 85ecff2a9d2c37bbddf7b630699642b34b3078ee (patch) | |
| tree | 96f824c116c8e93bd89f857ff86be4b54adc9c20 | |
| parent | 4b47bb17c6f9717b85ad5c101633324bb7d9b7c4 (diff) | |
| download | portage-85ecff2a9d2c37bbddf7b630699642b34b3078ee.tar.gz portage-85ecff2a9d2c37bbddf7b630699642b34b3078ee.tar.bz2 portage-85ecff2a9d2c37bbddf7b630699642b34b3078ee.zip | |
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
| -rw-r--r-- | pym/portage.py | 9 |
1 files 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: |