From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 17 Jan 2011 18:55:42 +0000 (-0800)
Subject: spawn_nofetch: fix PORTAGE_BUILDIR_LOCKED state
X-Git-Tag: v2.2.0_alpha16~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7134ab1074b57bcf812258e66993ebc2b8448253;p=portage.git

spawn_nofetch: fix PORTAGE_BUILDIR_LOCKED state

We need to correct the state of this variable here, in order to avoid
erroneous "ebuild phase 'nofetch' has exited unexpectedly" messages.
---

diff --git a/pym/portage/package/ebuild/_spawn_nofetch.py b/pym/portage/package/ebuild/_spawn_nofetch.py
index 175d88bd1..9ae801050 100644
--- a/pym/portage/package/ebuild/_spawn_nofetch.py
+++ b/pym/portage/package/ebuild/_spawn_nofetch.py
@@ -54,6 +54,8 @@ def spawn_nofetch(portdb, ebuild_path, settings=None):
 	private_tmpdir = tempfile.mkdtemp(dir=portage_tmpdir)
 	settings['PORTAGE_TMPDIR'] = private_tmpdir
 	settings.backup_changes('PORTAGE_TMPDIR')
+	# private temp dir was just created, so it's not locked yet
+	settings.pop('PORTAGE_BUILDIR_LOCKED', None)
 
 	try:
 		doebuild_environment(ebuild_path, 'nofetch',