diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-29 18:48:49 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-29 18:48:49 +0100 |
| commit | 488fab414343b13b242813e7cdebcee5fead4607 (patch) | |
| tree | d4660f316d6f545d51c23a47ec2a221e74f4ca87 | |
| parent | b1a697faada74f7fbb7a9c239270436c9bcafbd8 (diff) | |
| parent | 9427b1cf6607282cfbe5ef24b9904db6404a56ba (diff) | |
| download | abrt-488fab414343b13b242813e7cdebcee5fead4607.tar.gz abrt-488fab414343b13b242813e7cdebcee5fead4607.tar.xz abrt-488fab414343b13b242813e7cdebcee5fead4607.zip | |
Merge branch 'master' into rhel6
| -rw-r--r-- | lib/Plugins/Kerneloops.conf | 2 | ||||
| -rw-r--r-- | lib/Plugins/KerneloopsScanner.cpp | 1 | ||||
| -rw-r--r-- | src/Daemon/MiddleWare.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
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) { |