diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-30 09:22:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-30 09:22:30 +0000 |
| commit | be32dc342b03178f95c18da414dc1678220ba2f4 (patch) | |
| tree | 48d83787eb0eed53e14440bbad526d5f0f651fe9 | |
| parent | c40449f6e9746d92ef1d6a9d819b2395d8e6bab5 (diff) | |
| download | portage-be32dc342b03178f95c18da414dc1678220ba2f4.tar.gz portage-be32dc342b03178f95c18da414dc1678220ba2f4.tar.bz2 portage-be32dc342b03178f95c18da414dc1678220ba2f4.zip | |
Pass missing parameters to doebuild in order to avoid dependance on globals.
svn path=/main/trunk/; revision=3715
| -rwxr-xr-x | bin/emerge | 7 |
1 files 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) |