From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 12 Dec 2008 02:19:01 +0000 (-0000)
Subject: Fix --pretend logic in Binpkg some more.
X-Git-Tag: v2.2_rc18~12
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=006a77cbca947a09f3fe1054ff260dcb6ed61b93;p=portage.git

Fix --pretend logic in Binpkg some more.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index dbe00b709..eb1bd3b7a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3184,7 +3184,7 @@ class Binpkg(CompositeTask):
 
 		pkg = self.pkg
 		pkg_count = self.pkg_count
-		if not self.opts.fetchonly:
+		if not (self.opts.pretend or self.opts.fetchonly):
 			self._build_dir.lock()
 			try:
 				shutil.rmtree(self._build_dir.dir_path)
@@ -3369,7 +3369,7 @@ class Binpkg(CompositeTask):
 		self.wait()
 
 	def _unlock_builddir(self):
-		if self.opts.fetchonly:
+		if self.opts.pretend or self.opts.fetchonly:
 			return
 		portage.elog.elog_process(self.pkg.cpv, self.settings)
 		self._build_dir.unlock()