From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 10 Dec 2008 08:16:14 +0000 (-0000)
Subject: Make Binpkg clean the build dir immediately after locking it. This ensures
X-Git-Tag: v2.2_rc18~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d74a0b78ec46a098f9dcd40b28e280e02aaec18;p=portage.git

Make Binpkg clean the build dir immediately after locking it. This ensures
that a new PORTAGE_LOG_FILE is created.

svn path=/main/trunk/; revision=12198
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 44107ee20..632765490 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3186,6 +3186,12 @@ class Binpkg(CompositeTask):
 		pkg_count = self.pkg_count
 		if not self.opts.fetchonly:
 			self._build_dir.lock()
+			try:
+				shutil.rmtree(self._build_dir.dir_path)
+			except EnvironmentError, e:
+				if e.errno != errno.ENOENT:
+					raise
+				del e
 			portage.prepare_build_dirs(self.settings["ROOT"], self.settings, 1)
 		fetcher = BinpkgFetcher(background=self.background,
 			logfile=self.settings.get("PORTAGE_LOG_FILE"), pkg=self.pkg,