Matej Habrnal 0b651c
From d402628b64b0102803481f53e9e88d63ded56c08 Mon Sep 17 00:00:00 2001
Matej Habrnal 0b651c
From: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
Date: Wed, 9 Jul 2014 17:55:36 +0200
Matej Habrnal 0b651c
Subject: [PATCH] python: support exceptions without traceback
Matej Habrnal 0b651c
Matej Habrnal 0b651c
e.g. SyntaxError (python-2.7.5-13.fc20, python-2.7.7-2.fc21)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
---
Matej Habrnal 0b651c
 src/hooks/abrt_exception_handler.py.in | 14 ++++++++------
Matej Habrnal 0b651c
 1 file changed, 8 insertions(+), 6 deletions(-)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in
Matej Habrnal 0b651c
index cb32e14..fa4f34f 100644
Matej Habrnal 0b651c
--- a/src/hooks/abrt_exception_handler.py.in
Matej Habrnal 0b651c
+++ b/src/hooks/abrt_exception_handler.py.in
Matej Habrnal 0b651c
@@ -55,12 +55,14 @@ def write_dump(tb_text, tb):
Matej Habrnal 0b651c
         executable = sys.argv[0]
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     dso_list = None
Matej Habrnal 0b651c
-    try:
Matej Habrnal 0b651c
-        import rpm
Matej Habrnal 0b651c
-        dso_list = get_dso_list(tb)
Matej Habrnal 0b651c
-    except ImportError as imperr:
Matej Habrnal 0b651c
-        syslog("RPM module not available, cannot query RPM db for package "\
Matej Habrnal 0b651c
-               "names")
Matej Habrnal 0b651c
+    # Trace back is None in case of SyntaxError exception.
Matej Habrnal 0b651c
+    if tb:
Matej Habrnal 0b651c
+        try:
Matej Habrnal 0b651c
+            import rpm
Matej Habrnal 0b651c
+            dso_list = get_dso_list(tb)
Matej Habrnal 0b651c
+        except ImportError as imperr:
Matej Habrnal 0b651c
+            syslog("RPM module not available, cannot query RPM db for package "\
Matej Habrnal 0b651c
+                   "names")
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
     # Open ABRT daemon's socket and write data to it
Matej Habrnal 0b651c
     try:
Matej Habrnal 0b651c
-- 
Matej Habrnal 0b651c
1.9.3
Matej Habrnal 0b651c