diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-05 17:03:32 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-05 17:03:32 +0100 |
commit | dbbc2df18f5441d7b298c5d32e4199aa56f08ce0 (patch) | |
tree | adf4bce0a6a02d29da010f91c8264c4dd38ca465 /lib | |
parent | 9e7602b032c2187887c8164fa23c37d6daf28ac0 (diff) | |
download | abrt-dbbc2df18f5441d7b298c5d32e4199aa56f08ce0.tar.gz abrt-dbbc2df18f5441d7b298c5d32e4199aa56f08ce0.tar.xz abrt-dbbc2df18f5441d7b298c5d32e4199aa56f08ce0.zip |
add ProcessUnpackaged option to abrt.conf
Based on patch by Pekka Pietikainen <pp@ee.oulu.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Plugins/Bugzilla.cpp | 9 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsScanner.cpp | 2 | ||||
-rw-r--r-- | lib/Utils/DebugDump.cpp | 34 | ||||
-rw-r--r-- | lib/Utils/DebugDump.h | 2 |
4 files changed, 24 insertions, 23 deletions
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 6ec1f426..b3066d7c 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -391,8 +391,8 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData) if (env.fault_occurred) return -1; - log("New bug id: %i", bug_id); - update_client(_("New bug id: %i"), bug_id); + log("New bug id: %i", (int)bug_id); + update_client(_("New bug id: %i"), (int)bug_id); return bug_id; } @@ -585,6 +585,11 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, { update_client(_("Creating new bug...")); bug_id = bz_server.new_bug(pCrashData); + if (bug_id < 0) + { + throw_if_xml_fault_occurred(&bz_server.env); + throw CABRTException(EXCEP_PLUGIN, _("Bugzilla entry creation failed")); + } int ret = bz_server.add_attachments(to_string(bug_id).c_str(), pCrashData); if (ret == -1) { diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp index f30906ac..b0336b0b 100644 --- a/lib/Plugins/KerneloopsScanner.cpp +++ b/lib/Plugins/KerneloopsScanner.cpp @@ -121,9 +121,7 @@ void save_oops_to_debug_dump(const vector_string_t& oopsList) dd.SaveText(FILENAME_ANALYZER, "Kerneloops"); dd.SaveText(FILENAME_EXECUTABLE, "kernel"); 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/lib/Utils/DebugDump.cpp b/lib/Utils/DebugDump.cpp index 97c387c5..2d8da1ac 100644 --- a/lib/Utils/DebugDump.cpp +++ b/lib/Utils/DebugDump.cpp @@ -320,7 +320,23 @@ void CDebugDump::Create(const char *pDir, uid_t uid) } SaveText(CD_UID, to_string(uid).c_str()); - SaveKernelArchitectureRelease(); + + { + struct utsname buf; + if (uname(&buf) != 0) + { + perror_msg_and_die("uname"); + } + SaveText(FILENAME_KERNEL, buf.release); + SaveText(FILENAME_ARCHITECTURE, buf.machine); + std::string release; + LoadTextFile("/etc/redhat-release", release); + const char *release_ptr = release.c_str(); + unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr; + release.erase(len_1st_str); /* usually simply removes trailing '\n' */ + SaveText(FILENAME_RELEASE, release.c_str()); + } + time_t t = time(NULL); SaveText(FILENAME_TIME, to_string(t).c_str()); } @@ -374,22 +390,6 @@ void CDebugDump::Close() m_bOpened = false; } -void CDebugDump::SaveKernelArchitectureRelease() -{ - struct utsname buf; - if (uname(&buf) == 0) - { - SaveText(FILENAME_KERNEL, buf.release); - SaveText(FILENAME_ARCHITECTURE, buf.machine); - } - std::string release; - LoadTextFile("/etc/redhat-release", release); - const char *release_ptr = release.c_str(); - unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr; - release.erase(len_1st_str); /* usually simply removes trailing '\n' */ - SaveText(FILENAME_RELEASE, release.c_str()); -} - static void LoadTextFile(const char *pPath, std::string& pData) { FILE *fp = fopen(pPath, "r"); diff --git a/lib/Utils/DebugDump.h b/lib/Utils/DebugDump.h index a5de743f..f8487a65 100644 --- a/lib/Utils/DebugDump.h +++ b/lib/Utils/DebugDump.h @@ -34,8 +34,6 @@ class CDebugDump uid_t m_uid; gid_t m_gid; - void SaveKernelArchitectureRelease(); - void Lock(); void UnLock(); |