Only use the global vartree when really necessary.

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

diff --git a/pym/portage.py b/pym/portage.py
index 66e003a31e410c370c4a6696a3f2cecec6670163..42e58f7f297602b71a86b69d1d400c755ea0f262 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2697,9 +2697,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
        if mydbapi is None:
                mydbapi = db[myroot][tree].dbapi
 
-       if vartree is None and (mydo in ("merge", "qmerge", "unmerge") or \
-               "PORT_LOGDIR" in mysettings and \
-               mydo not in ("depend", "fetch", "digest", "manifest")):
+       if vartree is None and mydo in ("merge", "qmerge", "unmerge"):
                vartree = db[myroot]["vartree"]
 
        features = mysettings.features