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

3 files changed, 11 insertions, 7 deletions

diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index 8a5a797..aafa019 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -442,12 +442,12 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData,
         update_client(_("Checking for duplicates..."));
         bug_id = bz_server.check_uuid_in_bugzilla(component.c_str(), uuid.c_str());
 
-        update_client(_("Logging into bugzilla..."));
         if ((Login == "") && (Password == ""))
         {
             VERB3 log("Empty login and password");
             throw CABRTException(EXCEP_PLUGIN, _("Empty login and password. Please check Bugzilla.conf"));
         }
+        update_client(_("Logging into bugzilla..."));
         bz_server.login(Login.c_str(), Password.c_str());
 
         if (bug_id > 0)
@@ -458,7 +458,9 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData,
                 bz_server.add_plus_one_cc(bug_id, Login.c_str());
             }
             bz_server.logout();
-            return BugzillaURL + "/show_bug.cgi?id=" + to_string(bug_id);
+            BugzillaURL += "/show_bug.cgi?id=";
+            BugzillaURL += to_string(bug_id);
+            return BugzillaURL;
         }
 
         update_client(_("Creating new bug..."));
@@ -475,12 +477,16 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData,
 
     if (bug_id > 0)
     {
-        return BugzillaURL + "/show_bug.cgi?id=" + to_string(bug_id);
+        BugzillaURL += "/show_bug.cgi?id=";
+        BugzillaURL += to_string(bug_id);
+        return BugzillaURL;
     }
 
-    return BugzillaURL + "/show_bug.cgi?id=";
+    BugzillaURL += "/show_bug.cgi?id=";
+    return BugzillaURL;
 }
 
+//todo: make static
 map_plugin_settings_t CReporterBugzilla::parse_settings(const map_plugin_settings_t& pSettings)
 {
     map_plugin_settings_t plugin_settings;
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp
index 47043c2..42ffd40 100644
--- a/lib/Plugins/KerneloopsScanner.cpp
+++ b/lib/Plugins/KerneloopsScanner.cpp
@@ -34,8 +34,6 @@
 #include "KerneloopsSysLog.h"
 #include "KerneloopsScanner.h"
 
-#include <limits.h>
-
 // TODO: https://fedorahosted.org/abrt/ticket/78
 
 CKerneloopsScanner::CKerneloopsScanner()
diff --git a/lib/Plugins/Python.cpp b/lib/Plugins/Python.cpp
index 79247d6..ad95468 100644
--- a/lib/Plugins/Python.cpp
+++ b/lib/Plugins/Python.cpp
@@ -5,9 +5,9 @@
 
 static std::string CreateHash(const char *pDebugDumpDir)
 {
-	std::string uuid;
 	CDebugDump dd;
 	dd.Open(pDebugDumpDir);
+	std::string uuid;
 	dd.LoadText(FILENAME_UUID, uuid);
 	return uuid;
 }