From 59811d85f9d5a7f836834272fd90f753a3b92e46 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@redhat.com>
Date: Mon, 18 May 2009 17:14:54 +0200
Subject: minor fixes in reporter plugins

---
 lib/Plugins/Bugzilla.cpp | 2 +-
 lib/Plugins/Mailx.cpp    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index 8ad28cf..80cbec4 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -246,7 +246,7 @@ void CReporterBugzilla::AddAttachments(const std::string& pBugId, const map_cras
             try
             {
                 rpc->call(m_pXmlrpcClient, m_pCarriageParm);
-                ret =  xmlrpc_c::value_array(rpc->getResult()).vectorValueValue();
+                ret = xmlrpc_c::value_array(rpc->getResult()).vectorValueValue();
                 std::stringstream ss;
                 ss << xmlrpc_c::value_int(ret[0]);
                 comm_layer_inner_debug("New attachment id: " + ss.str());
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp
index 6e596f2..d4b44cf 100644
--- a/lib/Plugins/Mailx.cpp
+++ b/lib/Plugins/Mailx.cpp
@@ -98,7 +98,9 @@ void CMailx::Report(const map_crash_report_t& pCrashReport, const std::string& p
         }
         if (it->second[CD_TYPE] == CD_ATT)
         {
-            bigTextFiles << " -a " << it->second[CD_CONTENT];
+            bigTextFiles << it->first << std::endl;
+            bigTextFiles << "-----" << std::endl;
+            bigTextFiles << it->second[CD_CONTENT] << std::endl << std::endl;
         }
         if (it->second[CD_TYPE] == CD_BIN)
         {
@@ -117,7 +119,9 @@ void CMailx::Report(const map_crash_report_t& pCrashReport, const std::string& p
     emailBody << "Additional information" << std::endl;
     emailBody << "=====" << std::endl << std::endl;
     emailBody << additionalFiles.str() << std::endl;
-    m_sAttachments = bigTextFiles.str();
+    emailBody << "Other information" << std::endl;
+    emailBody << "=====" << std::endl << std::endl;
+    emailBody << bigTextFiles << std::endl;
 
     if (m_bSendBinaryData)
     {
-- 
cgit 


From 8ec13b1c89bcbf9c2d2cff8f1f7d29941495c3d2 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@redhat.com>
Date: Mon, 18 May 2009 17:16:47 +0200
Subject: improved catching of exceptions

---
 src/Daemon/Daemon.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 7acc7b1..893a764 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -18,6 +18,7 @@
     */
 
 #include "CrashWatcher.h"
+#include "ABRTException.h"
 #include <iostream>
 #include <cstdio>
 
@@ -65,6 +66,10 @@ int main(int argc, char** argv)
             g_pCrashWatcher->Run();
         }
     }
+    catch(CABRTException& e)
+    {
+        std::cerr << "Cannot create daemon: " << e.what() << std::endl;
+    }
     catch(std::exception& e)
     {
         std::cerr << "Cannot create daemon: " << e.what() << std::endl;
-- 
cgit 


From bc12d93a46c87ccf647f83b4eafd4378d19b9e29 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@redhat.com>
Date: Wed, 20 May 2009 09:14:32 +0200
Subject: bt for all threads

---
 lib/Plugins/CCpp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 2561842..cce3fb4 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -217,7 +217,7 @@ void CAnalyzerCCpp::GetBacktrace(const std::string& pDebugDumpDir, std::string&
         dd.Close();
         fTmp << "file " << executable << std::endl;
         fTmp << "core " << pDebugDumpDir << "/" << FILENAME_COREDUMP << std::endl;
-        fTmp << "bt full" << std::endl;
+        fTmp << "thread apply all backtrace full" << std::endl;
         fTmp << "q" << std::endl;
         fTmp.close();
     }
-- 
cgit