From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3B0813933E for ; Tue, 6 Jul 2021 22:13:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35793E0BEF; Tue, 6 Jul 2021 22:13:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 172FEE0BEF for ; Tue, 6 Jul 2021 22:13:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3116342B84 for ; Tue, 6 Jul 2021 22:13:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A4D7797 for ; Tue, 6 Jul 2021 22:13:22 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1625609459.29c56b4712c738ff37c4d506d42f1adb21b4ec9c.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 29c56b4712c738ff37c4d506d42f1adb21b4ec9c X-VCS-Branch: catalyst-3.0-stable Date: Tue, 6 Jul 2021 22:13:22 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e7edb39a-e3ee-4a44-9309-2254c4d23856 X-Archives-Hash: 2d83ad644244e6120407b66221cd377f commit: 29c56b4712c738ff37c4d506d42f1adb21b4ec9c Author: Matt Turner gentoo org> AuthorDate: Tue Jul 6 22:10:59 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Jul 6 22:10:59 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=29c56b47 catalyst: Remove remaining snakeoil LockInUse usage I missed this when backporting. Fixes: 9221e327 ("catalyst: Replace snakeoil's locks with fasteners") Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ad0028e1..28c4ee23 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1497,10 +1497,6 @@ class StageBase(TargetBase, ClearBase, GenBase): sys.stdout.flush() try: getattr(self, x)() - except LockInUse: - log.error('Unable to aquire the lock...') - failure = True - break except Exception: log.error('Exception running action sequence %s', x, exc_info=True) failure = True