Pass missing parameters to doebuild in order to avoid dependance on globals.

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

diff --git a/bin/emerge b/bin/emerge
index 09328b8caf1a5de6f376f7c1c5b0a26f9bc33048..fc11cfb97543d9b8cd9c5767c05bb4425cc32cc7 100755 (executable)
--- 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)