Use dbapi to unify config.setinst() call in depgraph.select_dep().

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

diff --git a/bin/emerge b/bin/emerge
index 568f156a59bf96e3c9a5d97c5341e9304d1561f2..701684bf9efe59fc4fc25ae3bfeaf32650072f9b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -982,10 +982,8 @@ class depgraph:
                        myp = myparent.split()
                        if myp[3]=="merge":
                                self.mydbapi[myroot].cpv_inject(myp[2])
-                               if myp[0]=="binary":
-                                       pkgsettings.setinst(myp[2], bindb)
-                               else:
-                                       pkgsettings.setinst(myp[2], portdb)
+                               pkgsettings.setinst(myp[2],
+                                       self.trees[myroot][self.pkg_tree_map[myp[0]]].dbapi)
 
                if not mymerge:
                        return 1