From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Nov 2009 23:33:06 +0000 (-0000)
Subject: In FakeVartree.sync(), skip the aux_get wrapper when populating old-style
X-Git-Tag: v2.2_rc53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec2e84fee7a2e9f7a175c753b22536df3b3ab21a;p=portage.git

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).

svn path=/main/trunk/; revision=14909
---

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):