diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-10 14:25:40 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-10 14:25:40 +0100 |
| commit | c0ee9dabb895e9079a6367a823187f9e687c3e4a (patch) | |
| tree | 0c06abb4063c099918e641be9106fb16ee2665a6 /src/Daemon | |
| parent | 8ddd4fb2e18e4ae996907a930aaedb5ceea1b78b (diff) | |
| download | abrt-c0ee9dabb895e9079a6367a823187f9e687c3e4a.tar.gz abrt-c0ee9dabb895e9079a6367a823187f9e687c3e4a.tar.xz abrt-c0ee9dabb895e9079a6367a823187f9e687c3e4a.zip | |
remove getSettings from most plugins (inherited one is ok)
Also move parse_release() to abrtlib, it's shared among
Bugzilla and Catcut.
Tested Bugzilla and Catcut, both work.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon')
| -rw-r--r-- | src/Daemon/Daemon.cpp | 11 | ||||
| -rw-r--r-- | src/Daemon/Settings.cpp | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 2945cc24..3ceab47c 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -376,23 +376,24 @@ static void FindNewDumps(const char* pPath) switch (res) { case MW_OK: - VERB1 log("Saving into database (%s)", itt->c_str()); + VERB1 log("Saving %s into database", itt->c_str()); RunActionsAndReporters(crashinfo[CD_MWDDD][CD_CONTENT].c_str()); break; case MW_IN_DB: - VERB1 log("Already saved in database (%s)", itt->c_str()); + VERB1 log("%s is already saved in database", itt->c_str()); break; case MW_REPORTED: case MW_OCCURED: + VERB1 log("Already saved crash %s, deleting", itt->c_str()); + DeleteDebugDumpDir(itt->c_str()); + break; case MW_BLACKLISTED: case MW_CORRUPTED: case MW_PACKAGE_ERROR: case MW_GPG_ERROR: case MW_FILE_ERROR: default: -//Perhaps corrupted & bad needs to be logged unconditionally, -//already saved one - only on VERB1 - VERB1 log("Corrupted, bad or already saved crash, deleting"); + log("Corrupted or bad crash %s (res:%d), deleting", itt->c_str(), (int)res); DeleteDebugDumpDir(itt->c_str()); break; } diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp index d9c9a98b..cefd35a4 100644 --- a/src/Daemon/Settings.cpp +++ b/src/Daemon/Settings.cpp @@ -132,7 +132,7 @@ static void ParseCommon() map_string_t::const_iterator end = s_mapSectionCommon.end(); if (it != end) { - g_settings_bOpenGPGCheck = it->second == "yes"; + g_settings_bOpenGPGCheck = string_to_bool(it->second.c_str()); } it = s_mapSectionCommon.find("OpenGPGPublicKeys"); if (it != end) |