Share the same config instance between portagetree and portdbapi instances since...

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

diff --git a/bin/emerge b/bin/emerge
index ba2f8de8f5f019aa7a2f4b1ac8507837d63ddcdd..44a9a6f80043a8f3c68d9814ec1aa04f1c60eb0c 100755 (executable)
--- 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 61bffdc96a311e48a025c7537f91c290fce6ea5d..9881d227dedeb77447e978eb6bfaa158b9c14644 100644 (file)
--- 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"