From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 74C34138247 for ; Wed, 22 Jan 2014 05:04:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9703FE117F; Wed, 22 Jan 2014 05:04:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF339E1174 for ; Wed, 22 Jan 2014 05:04:15 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A52F33FAF4 for ; Wed, 22 Jan 2014 05:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 80BC2187B5 for ; Wed, 22 Jan 2014 05:04:12 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388772142.7d07dfc12dd1de9f12e37484ebf6093e423ec8b9.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/clearbase.py catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 7d07dfc12dd1de9f12e37484ebf6093e423ec8b9 X-VCS-Branch: 3.0 Date: Wed, 22 Jan 2014 05:04:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b48fb0f8-9323-40b6-b3bb-5f3534176968 X-Archives-Hash: 9c35e5be329e3c949a59ed38471ab1d3 commit: 7d07dfc12dd1de9f12e37484ebf6093e423ec8b9 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 31 17:47:07 2013 +0000 Commit: Brian Dolbec gmail 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"] \