summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-21 22:31:43 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-21 22:31:43 +0000
commit8e8eaf08fb928f90de502c9ee4eb65bbd7ae93d8 (patch)
treed91b42e4780c8060f4d207699bfe97c6e394c9da
parent809dfcafb748a2cd500a9227eb12f59d2647fb4c (diff)
downloadportage-8e8eaf08fb928f90de502c9ee4eb65bbd7ae93d8.tar.gz
portage-8e8eaf08fb928f90de502c9ee4eb65bbd7ae93d8.tar.bz2
portage-8e8eaf08fb928f90de502c9ee4eb65bbd7ae93d8.zip
Make sure that PORTAGE_BUILDDIR exists before attempting to lock it. Depending on the phase, either BUILD_PREFIX or PKG_TMPDIR could be the parent, so we simply use PORTAGE_BUILDDIR to cover both cases.
svn path=/main/trunk/; revision=3985
-rw-r--r--pym/portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index fb5bf2c09..447f25c0a 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2657,8 +2657,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
try:
# Build directory creation isn't required for any of these.
if mydo not in ["fetch","digest","manifest"]:
- portage_util.ensure_dirs(
- mysettings["BUILD_PREFIX"], gid=portage_gid, mode=070, mask=02)
+ portage_util.ensure_dirs(mysettings["PORTAGE_BUILDDIR"],
+ gid=portage_gid, mode=070, mask=02)
builddir_lock = portage_locks.lockdir(
mysettings["PORTAGE_BUILDDIR"])
mystatus = prepare_build_dirs(myroot, mysettings, cleanup)