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 F3F49138ADA for ; Thu, 26 Feb 2015 20:12:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7868AE08AB; Thu, 26 Feb 2015 20:12:55 +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 1E07CE08AB for ; Thu, 26 Feb 2015 20:12:55 +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 6D695340C14 for ; Thu, 26 Feb 2015 20:12:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23210129DA for ; Thu, 26 Feb 2015 20:12:43 +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: <1420091886.a519c380faabe8278863d4615e24194d17c78c75.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/main.py catalyst/support.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a519c380faabe8278863d4615e24194d17c78c75 X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12:43 +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: f03fbd9f-9cc1-4bfa-8bc9-c32e70352882 X-Archives-Hash: cf20b370d73c663dd702ede99df1d8d2 Message-ID: <20150226201243.az33ngr-L1Gny6pt9eYfLiWSzNt1VhKduSeeKt_hb2s@z> commit: a519c380faabe8278863d4615e24194d17c78c75 Author: Brian Dolbec gentoo org> AuthorDate: Mon Feb 25 03:52:44 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a519c380 Fix typo in error message, clean up useless tracebacks Remove useless python tracebacks for bash side target failures. Conflicts: catalyst/main.py --- catalyst/base/stagebase.py | 2 +- catalyst/main.py | 2 -- catalyst/support.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index c16ef86..3056ce2 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1296,7 +1296,7 @@ class StageBase(TargetBase, ClearBase, GenBase): except CatalystError: self.unbind() raise CatalystError("Stage build aborting due to error.", - print_traceback=True) + print_traceback=False) def setup_environment(self): """ diff --git a/catalyst/main.py b/catalyst/main.py index 56e57c6..7fea4e7 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -163,8 +163,6 @@ def build_target(addlargs): try: target.run() except: - print "Target run() exception: Python traceback output follows:" - catalyst.util.print_traceback() print "!!! catalyst: Error encountered during run of target " + \ addlargs["target"] sys.exit(1) diff --git a/catalyst/support.py b/catalyst/support.py index 8c4876f..8f2e5df 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -90,7 +90,7 @@ class CatalystError(Exception): (type,value)=sys.exc_info()[:2] if value!=None: print - print "Traceback valuse found. listing..." + print "Traceback values found. listing..." print traceback.print_exc(file=sys.stdout) print print "!!! catalyst: "+message