From d5267ba3740d6a9a3c84981edc8c5456da31213d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 9 Jul 2006 19:07:54 +0000 Subject: Use dbapi to unify config.setinst() call in depgraph.select_dep(). svn path=/main/trunk/; revision=3820 --- bin/emerge | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 568f156a5..701684bf9 100755 --- 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 -- cgit v1.2.3-1-g7c22