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 36CE3139A8D 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 CA6D414214; 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 0826F14209 for ; Tue, 8 Sep 2015 14:14:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46CFF3407E6 for ; Tue, 8 Sep 2015 14:14:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3E06191 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.ce64d85fdd92920cae60cd93039f6cae35de51ad.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/main.py X-VCS-Directories: catalyst/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ce64d85fdd92920cae60cd93039f6cae35de51ad 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: 8cdf74df-fe4d-42d2-9ac9-5dd099bb44bd X-Archives-Hash: ba502df7797a95bccc1c2f9c8184942c commit: ce64d85fdd92920cae60cd93039f6cae35de51ad Author: Brian Dolbec gentoo org> AuthorDate: Tue Sep 8 06:13:30 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=ce64d85f main.py: Add an exception for CatalystError which would have been already handled Cleanup some dead code. catalyst/main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index dc9342b..2a5bdd3 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -163,13 +163,10 @@ def build_target(addlargs): raise CatalystError( "Target \"%s\" not available." % target, print_traceback=True) - - #try: + except CatalystError: + return target.run() - #except: - #print "!!! catalyst: Error encountered during run of target " + \ - # addlargs["target"] - #sys.exit(1) + def main(): 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 6E4CD139A8D for ; Tue, 8 Sep 2015 14:17:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB708141E3; Tue, 8 Sep 2015 14:17: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 87D5A141E3 for ; Tue, 8 Sep 2015 14:17:16 +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 83C5F3404B1 for ; Tue, 8 Sep 2015 14:17:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3654C190 for ; Tue, 8 Sep 2015 14:17:14 +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.ce64d85fdd92920cae60cd93039f6cae35de51ad.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/main.py X-VCS-Directories: catalyst/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ce64d85fdd92920cae60cd93039f6cae35de51ad X-VCS-Branch: master Date: Tue, 8 Sep 2015 14:17:14 +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: 07b92f0f-3e3c-41e9-943b-49680d99263c X-Archives-Hash: 955e84595eefc7bea0187d5da780c1f5 Message-ID: <20150908141714.xxkq1XIbENdUaeyK97Dn_fJCO0TklS6f4IHH20_GFbs@z> commit: ce64d85fdd92920cae60cd93039f6cae35de51ad Author: Brian Dolbec gentoo org> AuthorDate: Tue Sep 8 06:13:30 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=ce64d85f main.py: Add an exception for CatalystError which would have been already handled Cleanup some dead code. catalyst/main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index dc9342b..2a5bdd3 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -163,13 +163,10 @@ def build_target(addlargs): raise CatalystError( "Target \"%s\" not available." % target, print_traceback=True) - - #try: + except CatalystError: + return target.run() - #except: - #print "!!! catalyst: Error encountered during run of target " + \ - # addlargs["target"] - #sys.exit(1) + def main():