summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-30 08:54:32 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-30 08:54:32 +0000
commit2d8072d47f6aae70d9360c087f1d4d71e46b3cb4 (patch)
tree7f6816b7d81215b4239e1ea3d83aa8b2d73e2da1
parentfb055510b2eed0e7ff8468b8fd10065200b2f5d5 (diff)
downloadportage-2d8072d47f6aae70d9360c087f1d4d71e46b3cb4.tar.gz
portage-2d8072d47f6aae70d9360c087f1d4d71e46b3cb4.tar.bz2
portage-2d8072d47f6aae70d9360c087f1d4d71e46b3cb4.zip
Pass portdbapi instances into doebuild in order to avoid dependance on globals.
svn path=/main/trunk/; revision=3712
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 2a4d990d9..09328b8ca 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1838,7 +1838,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)
@@ -1851,7 +1851,8 @@ class depgraph:
") Compiling/Packaging ("+x[pkgindex]+"::"+y+\
")", short_msg=short_msg)
retval = portage.doebuild(y, "package", myroot,
- self.pkgsettings, self.edebug, tree="porttree")
+ self.pkgsettings, self.edebug, mydbapi=self.portdb,
+ tree="porttree")
if (retval is None):
portage_util.writemsg("Unable to run required binary.\n",
noiselevel=-1)