Merge branch 'master' of ssh://vda@git.fedorahosted.org/git/abrt

3 files changed, 18 insertions, 1 deletions

diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 8e102c0..c64e22a 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -871,3 +871,19 @@ map_crash_report_t CCrashWatcher::GetJobResult(uint64_t pJobID, const std::strin
     */
     return pending_jobs[pSender][pJobID];
 }
+
+vector_map_string_string_t CCrashWatcher::GetPluginsInfo()
+{
+    try
+    {
+        return m_pMW->GetPluginsInfo();
+    }
+    catch(CABRTException &e)
+    {
+        if (e.type() == EXCEP_FATAL)
+        {
+            throw e;
+        }
+        Warning(e.what());
+    }
+}
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index bc71269..420acc4 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -131,6 +131,7 @@ class CCrashWatcher
         virtual bool Report(map_crash_report_t pReport, const std::string &pUID);
         virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pUID);
         virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pSender);
+        virtual vector_map_string_string_t GetPluginsInfo();
 
         /* Observer methods */
         void Status(const std::string& pMessage,const std::string& pDest="0");
diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in
index 1532357..f4ebbb5 100644
--- a/src/Hooks/abrt_exception_handler.py.in
+++ b/src/Hooks/abrt_exception_handler.py.in
@@ -248,7 +248,7 @@ def handleMyException((etype, value, tb)):
 
     # add coredump saving
     write_dump(os.getpid(), tb_uuid, text)
-    sys.exit(__EXITCODE)
+    return sys.__excepthook__(etype, value, tb)
 
 def installExceptionHandler(debug = 1):
     """