summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-30 11:38:03 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-30 11:38:03 +0000
commitea42788b5bb39b90d7c57e609353d6d95e8e7cd3 (patch)
treea461a830e97606e105c28bf5b2a36cb8fd16ab43
parent5dd0999bb15312b4d1ea2c5fb44d652364299eca (diff)
downloadportage-ea42788b5bb39b90d7c57e609353d6d95e8e7cd3.tar.gz
portage-ea42788b5bb39b90d7c57e609353d6d95e8e7cd3.tar.bz2
portage-ea42788b5bb39b90d7c57e609353d6d95e8e7cd3.zip
Avoid global db usage in doebuild() except when absolutely necessary.
svn path=/main/trunk/; revision=3284
-rw-r--r--pym/portage.py4
1 files changed, 3 insertions, 1 deletions
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