From 2e09e459c97290fb067e5255caafb5de40677e86 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 27 Nov 2009 23:36:08 +0000 Subject: In FakeVartree.sync(), skip the aux_get wrapper when populating old-style virtuals, in order to avoid unwanted cache generation with --nodeps (reported by Arfrever). (trunk r14909) svn path=/main/branches/2.1.7/; revision=14910 --- pym/_emerge/FakeVartree.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index 3a9d5d639..728d44a71 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -106,7 +106,13 @@ class FakeVartree(portage.vartree): # Populate the old-style virtuals using the cached values. if not self.settings.treeVirtuals: - self.settings._populate_treeVirtuals(self) + # Skip the aux_get wrapper here, to avoid unwanted + # cache generation. + try: + self.dbapi.aux_get = self._aux_get + self.settings._populate_treeVirtuals(self) + finally: + self.dbapi.aux_get = self._aux_get_wrapper def _sync(self): -- cgit v1.2.3-1-g7c22