Avoid global db usage in doebuild() except when absolutely necessary.

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

diff --git a/pym/portage.py b/pym/portage.py
index 11d5e398f077714e4b4294bdd2d8960a183439e4..1bb7c17e925852b6f81f313f160b1f4dbec1b0e1 100644 (file)
--- 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