From be32dc342b03178f95c18da414dc1678220ba2f4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 30 Jun 2006 09:22:30 +0000 Subject: [PATCH] Pass missing parameters to doebuild in order to avoid dependance on globals. svn path=/main/trunk/; revision=3715 --- bin/emerge | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/emerge b/bin/emerge index 09328b8ca..fc11cfb97 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1891,7 +1891,7 @@ class depgraph: x[pkgindex]+"::"+y+")", short_msg=short_msg) retval = portage.doebuild(y, "clean", myroot, self.pkgsettings, self.edebug, cleanup=1, - tree="porttree") + mydbapi=self.portdb, tree="porttree") if (retval is None): portage_util.writemsg("Unable to run required binary.\n", noiselevel=-1) @@ -1904,7 +1904,10 @@ class depgraph: ") Compiling/Merging ("+x[pkgindex]+\ "::"+y+")", short_msg=short_msg) retval = portage.doebuild(y, "merge", myroot, - self.pkgsettings, self.edebug, tree="porttree") + self.pkgsettings, self.edebug, + vartree=self.trees[myroot]["vartree"], + mydbapi=self.portdb, tree="porttree", + prev_mtimes=ldpath_mtimes) if (retval is None): portage_util.writemsg("Unable to run required binary.\n", noiselevel=-1) -- 2.26.2