[gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     7d07dfc12dd1de9f12e37484ebf6093e423ec8b9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 17:47:07 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 18:02:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7d07dfc1

fix a "lockfile does not exist" issue at the end of the run.

---
 catalyst/base/clearbase.py | 2 ++
 catalyst/base/stagebase.py | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index 1a6ec77..a9f1d22 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -27,11 +27,13 @@ class ClearBase(object):
 
 
 	def clear_chroot(self):
+		self.chroot_lock.unlock()
 		print 'Clearing the chroot path ...'
 		clear_dir(self.settings["chroot_path"], 0755, True)
 
 
 	def remove_chroot(self):
+		self.chroot_lock.unlock()
 		print 'Removing the chroot path ...'
 		clear_dir(self.settings["chroot_path"], 0755, True, remove=True)
 

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a0b3fc2..f42d943 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1341,7 +1341,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 				self.mount_safety_check()
 				raise e
 
-		self.chroot_lock.unlock()
 
 	def unmerge(self):
 		if "autoresume" in self.settings["options"] \