From 24469ce8987d3f1ed5f1cef1b248f45fc59569f5 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 Jun 2006 11:16:08 +0000
Subject: Fix pkgmerge() to work without dependance on global variables.

svn path=/main/trunk/; revision=3717
---
 bin/emerge | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/emerge b/bin/emerge
index 6bde09bc1..38dce15ce 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1937,7 +1937,10 @@ class depgraph:
 				emergelog(xterm_titles, " === ("+str(mergecount)+\
 					" of "+str(len(mymergelist))+") Merging Binary ("+\
 					x[pkgindex]+"::"+mytbz2+")", short_msg=short_msg)
-				retval=portage.pkgmerge(mytbz2,x[1],self.pkgsettings)
+				retval = portage.pkgmerge(mytbz2, x[1], self.pkgsettings,
+					mydbapi=self.trees[self.settings["ROOT"]]["bintree"].dbapi,
+					vartree=self.trees[self.settings["ROOT"]]["vartree"],
+					prev_mtimes=ldpath_mtimes)
 				if retval is None:
 					sys.exit(1)
 				#need to check for errors
-- 
cgit v1.2.3-1-g7c22