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 93546139A8D for ; Tue, 8 Sep 2015 14:14:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAE8814209; Tue, 8 Sep 2015 14:14:49 +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 BDBEB141E3 for ; Tue, 8 Sep 2015 14:14:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8197340693 for ; Tue, 8 Sep 2015 14:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EF9918E for ; Tue, 8 Sep 2015 14:14:45 +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: <1441721508.85de4ce7be209e29ef661256293b6168bcadd1a0.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 85de4ce7be209e29ef661256293b6168bcadd1a0 X-VCS-Branch: pending Date: Tue, 8 Sep 2015 14:14:45 +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: 4dc58efd-1299-4542-a814-fcd2dd0e863c X-Archives-Hash: 4413e283c1fac360b76fc115a0646d15 Message-ID: <20150908141445.G5IP2HqGxCIEt4UulnfKRe8u2ibEHrzS51F6ebm39SE@z> commit: 85de4ce7be209e29ef661256293b6168bcadd1a0 Author: Brian Dolbec gentoo org> AuthorDate: Tue Sep 8 06:35:17 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue Sep 8 14:11:48 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=85de4ce7 stagebase.py: run() Add in an exception trap to cleanup mounts catalyst/base/stagebase.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a6694e6..bd6938c 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1421,7 +1421,14 @@ class StageBase(TargetBase, ClearBase, GenBase): for x in self.settings["action_sequence"]: print "--- Running action sequence: "+x sys.stdout.flush() - apply(getattr(self,x)) + try: + apply(getattr(self,x)) + except Exception as error: + print "Exception running action sequence %s" % x + print "Error:", str(error) + print "Running unbind()" + self.unbind() + break def unmerge(self):