summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-12 21:51:21 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-12 21:51:21 +0000
commitd14eaa534fb167dc0dfc8810ca1103d960fbefcd (patch)
treecf9d284de31b289ba49bfe0944d93d80476fcd74
parent15129ab7ac121a0a9f2dd4e767fbb5469f97c9f0 (diff)
downloadportage-d14eaa534fb167dc0dfc8810ca1103d960fbefcd.tar.gz
portage-d14eaa534fb167dc0dfc8810ca1103d960fbefcd.tar.bz2
portage-d14eaa534fb167dc0dfc8810ca1103d960fbefcd.zip
Fix --pretend logic in Binpkg some more. (trunk r12213)
svn path=/main/branches/2.1.6/; revision=12244
-rw-r--r--pym/_emerge/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a1783a001..418acebb7 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3165,7 +3165,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)
@@ -3350,7 +3350,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()