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

6 files changed, 23 insertions, 16 deletions

diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index 5734238..f17f9a7 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -226,7 +226,7 @@ uint32_t ctx::new_bug(const map_crash_report_t& pCrashReport)
     std::string arch = pCrashReport.find(FILENAME_ARCHITECTURE)->second[CD_CONTENT];
     std::string uuid = pCrashReport.find(CD_UUID)->second[CD_CONTENT];
 
-    std::string summary = "[abrt] crash detected in " + package;
+    std::string summary = "[abrt] crash in " + package;
     std::string status_whiteboard = "abrt_hash:" + uuid;
 
     std::string description = "abrt "VERSION" detected a crash.\n\n";
@@ -363,7 +363,7 @@ std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport,
         if ((Login == "") && (Password == ""))
         {
             VERB3 log("Empty login and password");
-            throw CABRTException(EXCEP_PLUGIN, std::string(_("Empty login and password. Please check Bugzilla.conf")));
+            throw CABRTException(EXCEP_PLUGIN, _("Empty login and password. Please check Bugzilla.conf"));
         }
         bz_server.login(Login.c_str(), Password.c_str());
 
diff --git a/lib/Plugins/CCpp.conf b/lib/Plugins/CCpp.conf
index 459dff8..e5ba5ad 100644
--- a/lib/Plugins/CCpp.conf
+++ b/lib/Plugins/CCpp.conf
@@ -1,8 +1,13 @@
-# Configuration file for CCpp add-on
-# generate memory map too (IGNORED FOR NOW)
+# Configuration file for CCpp hook and plugin
+
+# If you also want to dump file named "core"
+# in crashed process' current dir, set to "yes"
+MakeCompatCore = no
+
+# Generate memory map too (IGNORED FOR NOW)
 MemoryMap = no
 
-# how to get debug-info: install, mount
+# How to get debug-info: install, mount
 ## install - download and install debug-info packages
 ## mount - mount fedora NFS with debug info
 ## (IGNORED FOR NOW)
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index d83d9b5..01f4eb1 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -932,7 +932,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force)
     GetBacktrace(pDebugDumpDir, m_sDebugInfoDirs.c_str(), backtrace);
 
     dd.Open(pDebugDumpDir);
-    dd.SaveText(FILENAME_BACKTRACE, (build_ids + backtrace).c_str());
+    dd.SaveText(FILENAME_BACKTRACE, (backtrace + build_ids).c_str());
     if (m_bMemoryMap)
     {
         dd.SaveText(FILENAME_MEMORYMAP, "memory map of the crashed C/C++ application, not implemented yet");
diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp
index e353cbe..7add58c 100644
--- a/lib/Plugins/Catcut.cpp
+++ b/lib/Plugins/Catcut.cpp
@@ -21,7 +21,7 @@ put_stream(const char *pURL, FILE* f, size_t content_length)
     CURL* curl = curl_easy_init();
     if (!curl)
     {
-        throw CABRTException(EXCEP_PLUGIN, "put_stream: Curl library error.");
+        throw CABRTException(EXCEP_PLUGIN, "put_stream: can't initialize curl library");
     }
     /* enable uploading */
     curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
@@ -31,7 +31,7 @@ put_stream(const char *pURL, FILE* f, size_t content_length)
     curl_easy_setopt(curl, CURLOPT_READDATA, f);
     /* get file size */
     curl_easy_setopt(curl, CURLOPT_INFILESIZE, content_length);
-    /*everything is done here; result 0 means success*/
+    /* everything is done here; result 0 means success */
     int result = curl_easy_perform(curl);
     /* goodbye */
     curl_easy_cleanup(curl);
@@ -56,7 +56,7 @@ send_string(const char *pURL,
         FILE* f = fmemopen((void*)pContent, content_length, "r");
         if (!f)
         {
-            throw CABRTException(EXCEP_PLUGIN, "send_string: could not open string stream");
+            throw CABRTException(EXCEP_PLUGIN, "send_string: can't open string stream");
         }
         int result = put_stream(pURL, f, content_length);
         fclose(f);
@@ -67,7 +67,7 @@ send_string(const char *pURL,
     /*retry the upload if not succesful, wait a bit before next try*/
     while (--retryCount != 0 && (sleep(retryDelaySeconds), 1));
 
-    throw CABRTException(EXCEP_PLUGIN, "send_string: could not send string");
+    throw CABRTException(EXCEP_PLUGIN, "send_string: can't send string");
 }
 
 static void
@@ -89,7 +89,7 @@ send_file(const char *pURL,
         FILE* f = fopen(pFilename, "r");
         if (!f)
         {
-            throw CABRTException(EXCEP_PLUGIN, "send_file: could not open string stream");
+            throw CABRTException(EXCEP_PLUGIN, "send_file: can't open string stream");
         }
         struct stat buf;
         fstat(fileno(f), &buf); /* can't fail */
@@ -103,7 +103,7 @@ send_file(const char *pURL,
     /*retry the upload if not succesful, wait a bit before next try*/
     while (--retryCount != 0 && (sleep(retryDelaySeconds), 1));
 
-    throw CABRTException(EXCEP_PLUGIN, "send_file: could not send file");
+    throw CABRTException(EXCEP_PLUGIN, "send_file: can't send file");
 }
 
 static string
@@ -268,7 +268,7 @@ ctx::new_bug(const char *auth_cookie, const map_crash_report_t& pCrashReport)
     string arch = pCrashReport.find(FILENAME_ARCHITECTURE)->second[CD_CONTENT];
     string uuid = pCrashReport.find(CD_UUID)->second[CD_CONTENT];
 
-    string summary = "[abrt] crash detected in " + package;
+    string summary = "[abrt] crash in " + package;
     string status_whiteboard = "abrt_hash:" + uuid;
 
     string description = make_description_catcut(pCrashReport);
@@ -462,12 +462,12 @@ string CReporterCatcut::Report(const map_crash_report_t& pCrashReport,
             }
             else
             {
-                message = "Error could not create ticket";
+                message = "Error: can't create ticket";
             }
         }
         else
         {
-            message = "Error could not create ticket";
+            message = "Error: can't create ticket";
         }
         return message;
     }
diff --git a/lib/Plugins/Kerneloops.conf b/lib/Plugins/Kerneloops.conf
index 08dacd0..a014153 100644
--- a/lib/Plugins/Kerneloops.conf
+++ b/lib/Plugins/Kerneloops.conf
@@ -1,6 +1,8 @@
 # compatibility with kerneloops.org tool
 InformAllUsers = yes
 
+AutoReportUIDs = root
+
 # KerneloopsReporter configuration. Reports kernel crashes collected by the addon.
 ################################################################################
 
diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp
index f38f503..a1fd3f1 100644
--- a/lib/Plugins/KerneloopsReporter.cpp
+++ b/lib/Plugins/KerneloopsReporter.cpp
@@ -113,7 +113,7 @@ std::string CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport,
 		/* FIXME: be more informative */
 		throw CABRTException(EXCEP_PLUGIN, std::string("CKerneloopsReporter::Report(): Report has not been sent..."));
 	}
-	return "Kernel oops report was uploaded to: " + m_sSubmitURL;
+	return "Kernel oops report was uploaded.";
 }
 
 void CKerneloopsReporter::SetSettings(const map_plugin_settings_t& pSettings)