| 1 |
commit: f60f19ae5e6c6a82beb045e18465d62fd1e85f50 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 22 01:54:08 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jan 22 04:35:25 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f60f19ae |
| 7 |
|
| 8 |
Remove excessive exceptions hiding tracebacks |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/main.py | 28 ++++++---------------------- |
| 12 |
1 file changed, 6 insertions(+), 22 deletions(-) |
| 13 |
|
| 14 |
diff --git a/catalyst/main.py b/catalyst/main.py |
| 15 |
index 6f8bd8d..0366932 100644 |
| 16 |
--- a/catalyst/main.py |
| 17 |
+++ b/catalyst/main.py |
| 18 |
@@ -349,10 +349,10 @@ def main(): |
| 19 |
try: |
| 20 |
build_target(addlargs) |
| 21 |
|
| 22 |
- except CatalystError: |
| 23 |
- print |
| 24 |
- print "Catalyst aborting...." |
| 25 |
- sys.exit(2) |
| 26 |
+ #except CatalystError: |
| 27 |
+ # print |
| 28 |
+ # print "Catalyst aborting...." |
| 29 |
+ # sys.exit(2) |
| 30 |
except KeyboardInterrupt: |
| 31 |
print "\nCatalyst build aborted due to user interrupt ( Ctrl-C )" |
| 32 |
print |
| 33 |
@@ -361,24 +361,8 @@ def main(): |
| 34 |
except LockInUse: |
| 35 |
print "Catalyst aborting...." |
| 36 |
sys.exit(2) |
| 37 |
- except: |
| 38 |
- print "Catalyst aborting...." |
| 39 |
- raise |
| 40 |
- sys.exit(2) |
| 41 |
- |
| 42 |
- #except CatalystError: |
| 43 |
- # print |
| 44 |
- # print "Catalyst aborting...." |
| 45 |
- # sys.exit(2) |
| 46 |
- #except KeyError: |
| 47 |
- # print "\nproblem with command line or spec file ( Key Error )" |
| 48 |
- # print "Key: "+str(sys.exc_value)+" was not found" |
| 49 |
+ #except: |
| 50 |
# print "Catalyst aborting...." |
| 51 |
- # sys.exit(2) |
| 52 |
- #except UnboundLocalError: |
| 53 |
- # print |
| 54 |
- # print "UnboundLocalError: "+str(sys.exc_value)+" was not found" |
| 55 |
# raise |
| 56 |
- # print |
| 57 |
- # print "Catalyst aborting...." |
| 58 |
# sys.exit(2) |
| 59 |
+ |
Archives