summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-11-27 23:36:08 +0000
committerZac Medico <zmedico@gentoo.org>2009-11-27 23:36:08 +0000
commit2e09e459c97290fb067e5255caafb5de40677e86 (patch)
tree58d5e1b4936a1cc3fe87fae17648e771dcc45a29
parentBug #294886 - Show some basic info at the beginning of the build log, (diff)
downloadportage-multirepo-2e09e459c97290fb067e5255caafb5de40677e86.tar.gz
portage-multirepo-2e09e459c97290fb067e5255caafb5de40677e86.tar.bz2
portage-multirepo-2e09e459c97290fb067e5255caafb5de40677e86.zip
In FakeVartree.sync(), skip the aux_get wrapper when populating old-stylev2.1.7.8
virtuals, in order to avoid unwanted cache generation with --nodeps (reported by Arfrever). (trunk r14909) svn path=/main/branches/2.1.7/; revision=14910
-rw-r--r--pym/_emerge/FakeVartree.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 3a9d5d63..728d44a7 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):