summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-30 08:45:09 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-30 08:45:09 +0000
commitfb055510b2eed0e7ff8468b8fd10065200b2f5d5 (patch)
tree92886569e5f1d41864e848196742bae934fa6c2d /pym
parent3cb13dc3fb35572f9f5f67507715747bb1d0863b (diff)
downloadportage-fb055510b2eed0e7ff8468b8fd10065200b2f5d5.tar.gz
portage-fb055510b2eed0e7ff8468b8fd10065200b2f5d5.tar.bz2
portage-fb055510b2eed0e7ff8468b8fd10065200b2f5d5.zip
Only use the global vartree when really necessary.
svn path=/main/trunk/; revision=3711
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py4
1 files changed, 1 insertions, 3 deletions
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