| 1 |
commit: 7d07dfc12dd1de9f12e37484ebf6093e423ec8b9 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 31 17:47:07 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Jan 3 18:02:22 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7d07dfc1 |
| 7 |
|
| 8 |
fix a "lockfile does not exist" issue at the end of the run. |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/base/clearbase.py | 2 ++ |
| 12 |
catalyst/base/stagebase.py | 1 - |
| 13 |
2 files changed, 2 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py |
| 16 |
index 1a6ec77..a9f1d22 100644 |
| 17 |
--- a/catalyst/base/clearbase.py |
| 18 |
+++ b/catalyst/base/clearbase.py |
| 19 |
@@ -27,11 +27,13 @@ class ClearBase(object): |
| 20 |
|
| 21 |
|
| 22 |
def clear_chroot(self): |
| 23 |
+ self.chroot_lock.unlock() |
| 24 |
print 'Clearing the chroot path ...' |
| 25 |
clear_dir(self.settings["chroot_path"], 0755, True) |
| 26 |
|
| 27 |
|
| 28 |
def remove_chroot(self): |
| 29 |
+ self.chroot_lock.unlock() |
| 30 |
print 'Removing the chroot path ...' |
| 31 |
clear_dir(self.settings["chroot_path"], 0755, True, remove=True) |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 35 |
index a0b3fc2..f42d943 100644 |
| 36 |
--- a/catalyst/base/stagebase.py |
| 37 |
+++ b/catalyst/base/stagebase.py |
| 38 |
@@ -1341,7 +1341,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 39 |
self.mount_safety_check() |
| 40 |
raise e |
| 41 |
|
| 42 |
- self.chroot_lock.unlock() |
| 43 |
|
| 44 |
def unmerge(self): |
| 45 |
if "autoresume" in self.settings["options"] \ |
Archives