From ea42788b5bb39b90d7c57e609353d6d95e8e7cd3 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Apr 2006 11:38:03 +0000
Subject: Avoid global db usage in doebuild() except when absolutely necessary.

svn path=/main/trunk/; revision=3284
---
 pym/portage.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pym/portage.py')

diff --git a/pym/portage.py b/pym/portage.py
index 11d5e398f..1bb7c17e9 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2613,7 +2613,9 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 	if mydbapi is None:
 		mydbapi = db[myroot][tree].dbapi
 
-	if vartree is None:
+	if vartree is None and (mydo in ("merge, qmerge") or \
+		"PORT_LOGDIR" in mysettings and \
+		mydo not in ("depend", "fetch", "digest", "manifest")):
 		vartree = db[myroot]["vartree"]
 
 	features = mysettings.features
-- 
cgit v1.2.3-1-g7c22