diff options
| author | Karel Klic <kklic@redhat.com> | 2011-03-01 12:08:36 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2011-03-01 12:08:36 +0100 |
| commit | 85f639b7fe277ba327e5013e5b101b4a67f14e1d (patch) | |
| tree | 7caa3999e8c987e3ddbc26f4bfbbdc73defca73f /src/hooks/abrt_exception_handler.py.in | |
| parent | fb52104af74bbf6eeda394880666df40b4354aba (diff) | |
| parent | 77468fcdd7cc05db52320c373a24a5490ff32f52 (diff) | |
| download | abrt-85f639b7fe277ba327e5013e5b101b4a67f14e1d.tar.gz abrt-85f639b7fe277ba327e5013e5b101b4a67f14e1d.tar.xz abrt-85f639b7fe277ba327e5013e5b101b4a67f14e1d.zip | |
merge changes from master
Diffstat (limited to 'src/hooks/abrt_exception_handler.py.in')
| -rw-r--r-- | src/hooks/abrt_exception_handler.py.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in index dd6fbaed..d12968e1 100644 --- a/src/hooks/abrt_exception_handler.py.in +++ b/src/hooks/abrt_exception_handler.py.in @@ -25,7 +25,6 @@ Module for the ABRT exception handling hook import sys import os import syslog -import subprocess import socket def write_dump(pid, tb): @@ -61,8 +60,10 @@ def handleMyException((etype, value, tb)): # restore original exception handler sys.excepthook = sys.__excepthook__ # pylint: disable-msg=E1101 - # ignore uncaught ctrl-c - if etype == KeyboardInterrupt: + # ignore + # - uncaught ctrl-c + # - SystemExit rhbz#636913 -> this exception is not an error + if etype in [KeyboardInterrupt, SystemExit]: return sys.__excepthook__(etype, value, tb) try: |