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 3a9d5d639110617445a0e534fa60556b59305f08..728d44a715bba752af540604af4d8c8c86c8401c 100644 (file)
--- 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):