diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-30 11:16:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-30 11:16:08 +0000 |
| commit | 24469ce8987d3f1ed5f1cef1b248f45fc59569f5 (patch) | |
| tree | 98e4f11561628400feb474626035786f9abfaefe /bin | |
| parent | b74bf9d6ad8ef6e743efa78a1d97699d91e3f68e (diff) | |
| download | portage-24469ce8987d3f1ed5f1cef1b248f45fc59569f5.tar.gz portage-24469ce8987d3f1ed5f1cef1b248f45fc59569f5.tar.bz2 portage-24469ce8987d3f1ed5f1cef1b248f45fc59569f5.zip | |
Fix pkgmerge() to work without dependance on global variables.
svn path=/main/trunk/; revision=3717
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 4 insertions, 1 deletions
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 |