From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 Jun 2006 08:45:09 +0000 (-0000)
Subject: Only use the global vartree when really necessary.
X-Git-Tag: v2.1.1~332
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb055510b2eed0e7ff8468b8fd10065200b2f5d5;p=portage.git

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 66e003a31..42e58f7f2 100644
--- 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