| 1 |
commit: a519c380faabe8278863d4615e24194d17c78c75 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 25 03:52:44 2013 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 1 05:58:06 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a519c380 |
| 7 |
|
| 8 |
Fix typo in error message, clean up useless tracebacks |
| 9 |
|
| 10 |
Remove useless python tracebacks for bash side target failures. |
| 11 |
|
| 12 |
Conflicts: |
| 13 |
catalyst/main.py |
| 14 |
|
| 15 |
--- |
| 16 |
catalyst/base/stagebase.py | 2 +- |
| 17 |
catalyst/main.py | 2 -- |
| 18 |
catalyst/support.py | 2 +- |
| 19 |
3 files changed, 2 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 22 |
index c16ef86..3056ce2 100644 |
| 23 |
--- a/catalyst/base/stagebase.py |
| 24 |
+++ b/catalyst/base/stagebase.py |
| 25 |
@@ -1296,7 +1296,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 26 |
except CatalystError: |
| 27 |
self.unbind() |
| 28 |
raise CatalystError("Stage build aborting due to error.", |
| 29 |
- print_traceback=True) |
| 30 |
+ print_traceback=False) |
| 31 |
|
| 32 |
def setup_environment(self): |
| 33 |
""" |
| 34 |
|
| 35 |
diff --git a/catalyst/main.py b/catalyst/main.py |
| 36 |
index 56e57c6..7fea4e7 100644 |
| 37 |
--- a/catalyst/main.py |
| 38 |
+++ b/catalyst/main.py |
| 39 |
@@ -163,8 +163,6 @@ def build_target(addlargs): |
| 40 |
try: |
| 41 |
target.run() |
| 42 |
except: |
| 43 |
- print "Target run() exception: Python traceback output follows:" |
| 44 |
- catalyst.util.print_traceback() |
| 45 |
print "!!! catalyst: Error encountered during run of target " + \ |
| 46 |
addlargs["target"] |
| 47 |
sys.exit(1) |
| 48 |
|
| 49 |
diff --git a/catalyst/support.py b/catalyst/support.py |
| 50 |
index 8c4876f..8f2e5df 100644 |
| 51 |
--- a/catalyst/support.py |
| 52 |
+++ b/catalyst/support.py |
| 53 |
@@ -90,7 +90,7 @@ class CatalystError(Exception): |
| 54 |
(type,value)=sys.exc_info()[:2] |
| 55 |
if value!=None: |
| 56 |
print |
| 57 |
- print "Traceback valuse found. listing..." |
| 58 |
+ print "Traceback values found. listing..." |
| 59 |
print traceback.print_exc(file=sys.stdout) |
| 60 |
print |
| 61 |
print "!!! catalyst: "+message |
Archives