From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 9 Jul 2006 19:07:54 +0000 (-0000)
Subject: Use dbapi to unify config.setinst() call in depgraph.select_dep().
X-Git-Tag: v2.1.1~259
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5267ba3740d6a9a3c84981edc8c5456da31213d;p=portage.git

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 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