diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-29 18:38:12 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-29 18:38:12 +0100 |
| commit | 6b94b2401208140c3cf12338a8eba4b17f1933bb (patch) | |
| tree | 9c4134a3f3397977959d911abdfae3e37f83125c | |
| parent | b1a697faada74f7fbb7a9c239270436c9bcafbd8 (diff) | |
| parent | 0297376c8b46d72dc39f6a7e598ae62f46d02b1a (diff) | |
Merge branch 'master' into rhel6
| -rw-r--r-- | lib/Plugins/KerneloopsScanner.cpp | 1 | ||||
| -rw-r--r-- | src/Daemon/MiddleWare.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
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) { |