From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 7 Dec 2006 21:55:51 +0000 (-0000)
Subject: Share the same config instance between portagetree and portdbapi instances since... 
X-Git-Tag: v2.1.2~374
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e32ddbb0b19dbe110faee7f516756e3753cdb270;p=portage.git

Share the same config instance between portagetree and portdbapi instances since clone isn't needed here. Also, trigger population of virtuals prior to cloning in emerge.  This reduces the number of times the virtuals are populated from 3 to just 1.

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

diff --git a/bin/emerge b/bin/emerge
index ba2f8de8f..44a9a6f80 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -752,6 +752,8 @@ class depgraph:
 				self.trees[myroot][tree] = trees[myroot][tree]
 			self.trees[myroot]["vartree"] = \
 				FakeVartree(trees[myroot]["vartree"])
+			# Make sure the virtuals are populated before cloning.
+			trees[myroot]["vartree"].settings.getvirtuals()
 			self.pkgsettings[myroot] = portage.config(
 				clone=self.trees[myroot]["vartree"].settings)
 			self.pkg_node_map[myroot] = {}
diff --git a/pym/portage.py b/pym/portage.py
index 61bffdc96..9881d227d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4264,7 +4264,7 @@ class portagetree:
 			self.portroot=settings["PORTDIR"]
 			self.virtual=virtual
 			self.dbapi = portdbapi(
-				settings["PORTDIR"], mysettings=config(clone=settings))
+				settings["PORTDIR"], mysettings=settings)
 
 	def dep_bestmatch(self,mydep):
 		"compatibility method"