commit: a519c380faabe8278863d4615e24194d17c78c75 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Mon Feb 25 03:52:44 2013 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> 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