summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2011-01-05 11:34:28 +0100
committerJiri Moskovcak <jmoskovc@redhat.com>2011-01-05 11:42:23 +0100
commit946d0c8148d9ec9916b5460fb8c12fc3eb9401a8 (patch)
treece336108a25f94347799fa227255de140867d862
parent5f66c6ffc1997a3f1c016b3492e2bb1ac2953cce (diff)
downloadabrt-946d0c8148d9ec9916b5460fb8c12fc3eb9401a8.tar.gz
abrt-946d0c8148d9ec9916b5460fb8c12fc3eb9401a8.tar.xz
abrt-946d0c8148d9ec9916b5460fb8c12fc3eb9401a8.zip
PyHook: ignore SystemExit exception rhbz#636913
- SystemExit is not an error, so ABRT should ignore it - see http://docs.python.org/library/exceptions.html#exceptions.SystemExit for more details
-rw-r--r--src/Hooks/abrt_exception_handler.py.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in
index dd6fbaed..6081d639 100644
--- a/src/Hooks/abrt_exception_handler.py.in
+++ b/src/Hooks/abrt_exception_handler.py.in
@@ -61,8 +61,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: