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

6 files changed, 35 insertions, 8 deletions

diff --git a/abrt.spec b/abrt.spec
index 401285b..c9b8d90 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -403,6 +403,27 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Jan 29 2010  Jiri Moskovcak <jmoskovc@redhat.com> 1.0.5-1
+- moved the gpg key list from abrt.conf to gpg_keys file (jmoskovc@redhat.com)
+- Logger: create log file with mode 0600 (vda.linux@googlemail.com)
+- GUI: fixed the rating logic, to prevent sending BT with rating < 3 (jmoskovc@redhat.com)
+- Report GUI: made more fields copyable - closed rhbz#526209; tweaked wording (vda.linux@googlemail.com)
+- GUI: fixed bug caused by failed gk-authorization (jmoskovc@redhat.com)
+- fix bug 559881 (kerneloops not shown in "new" GUI) (vda.linux@googlemail.com)
+- GUI ReporterDialog: hide log button (vda.linux@googlemail.com)
+- added valgrind and strace to blacklist (jmoskovc@redhat.com)
+- SOSreport: do not leave stray files in /tmp (vda.linux@googlemail.com)
+- Save the core where it belongs if ulimit -c is > 0 (jmoskovc@redhat.com)
+- reenabled gpg check (jmoskovc@redhat.com)
+- SOSreport: run it niced (vda.linux@googlemail.com)
+- report GUI: rename buttons: Log -> Show log, Send -> Send report (vda.linux@googlemail.com)
+- applet: reduce blinking timeout to 3 sec (vda.linux@googlemail.com)
+- fix dbus autostart (vda.linux@googlemail.com)
+- abrtd: set "Reported" status only if at least one reporter succeeded (vda.linux@googlemail.com)
+- SQLite3: disable newline escaping, SQLite does not handle it (vda.linux@googlemail.com)
+- SOSreport: make it avoid double runs; add forced regeneration; upd PLUGINS-HOWTO (vda.linux@googlemail.com)
+- attribute SEGVs in perl to script's package, like we already do for python (vda.linux@googlemail.com)
+
 * Wed Jan 20 2010  Jiri Moskovcak <jmoskovc@redhat.com> 1.0.4-1
 - enabled sosreport
 - fixes in ticketuploader
diff --git a/configure.ac b/configure.ac
index 6cc65a8..e89ac14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([abrt], [1.0.4], [crash-catcher@fedorahosted.org])
+AC_INIT([abrt], [1.0.5], [crash-catcher@fedorahosted.org])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
diff --git a/lib/Plugins/Kerneloops.conf b/lib/Plugins/Kerneloops.conf
index 4d6bd46..77fca51 100644
--- a/lib/Plugins/Kerneloops.conf
+++ b/lib/Plugins/Kerneloops.conf
@@ -8,7 +8,7 @@ InformAllUsers = yes
 # With default abrt.conf, it invokes KerneloopsReporter
 # and thus reports oops to kerneloops.org.
 # ("root" because all oopses are filed by abrt with user "root")
-AutoReportUIDs = root
+# AutoReportUIDs = root
 
 # Kerneloops Scanner configuration
 ##################################
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp
index fb9bac6..0676934 100644
--- a/lib/Plugins/KerneloopsScanner.cpp
+++ b/lib/Plugins/KerneloopsScanner.cpp
@@ -101,6 +101,7 @@ void CKerneloopsScanner::SaveOopsToDebugDump()
 			dd.SaveText(FILENAME_KERNEL, first_line);
 			dd.SaveText(FILENAME_PACKAGE, "not_applicable");
 			dd.SaveText(FILENAME_CMDLINE, "not_applicable");
+			dd.SaveText(FILENAME_COMPONENT, "kernel");
 			dd.SaveText(FILENAME_KERNELOOPS, second_line);
 		}
 		catch (CABRTException& e)
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index f69c8a3..2786938 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -688,7 +688,9 @@ static mw_result_t SavePackageDescriptionToDebugDump(
         dd.Open(pDebugDumpDir);
         dd.SaveText(FILENAME_PACKAGE, package.c_str());
         dd.SaveText(FILENAME_DESCRIPTION, description.c_str());
-        dd.SaveText(FILENAME_COMPONENT, component.c_str());
+        /* For oopses, pExecutable == "kernel" gives "" here. Don't write it */
+        if (component.size() != 0)
+            dd.SaveText(FILENAME_COMPONENT, component.c_str());
     }
     catch (CABRTException& e)
     {
diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py
index 893c23f..a69a68e 100644
--- a/src/Gui/SettingsDialog.py
+++ b/src/Gui/SettingsDialog.py
@@ -103,10 +103,13 @@ class SettingsDialog:
         ## MaxCrashSize
         self.builder.get_object("sbMaxCrashReportsSize").set_value(float(common["MaxCrashReportsSize"]))
         ## GPG keys
-        self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"])
-        self.gpgkeys = common["OpenGPGPublicKeys"].split(',')
-        for gpgkey in self.gpgkeys:
-            self.GPGKeysListStore.append([gpgkey])
+        try:
+            self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"])
+            self.gpgkeys = common["OpenGPGPublicKeys"].split(',')
+            for gpgkey in self.gpgkeys:
+                self.GPGKeysListStore.append([gpgkey])
+        except:
+            pass
 
         ## blacklist
         self.builder.get_object("eBlacklist").set_text(common["BlackList"])