diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-23 14:55:08 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-23 14:55:08 +0100 |
commit | d556705dd2948047d55d52e4c6cf921f276b2d77 (patch) | |
tree | 02ef57b4d1741eec54391edd6a4cad4e60ed7641 /src | |
parent | 47d99223599b1c880dd0e2b827213fad60b7ff11 (diff) | |
parent | 4b3c5291814821a6f9824971b8a00771a378f6eb (diff) | |
download | abrt-d556705dd2948047d55d52e4c6cf921f276b2d77.tar.gz abrt-d556705dd2948047d55d52e4c6cf921f276b2d77.tar.xz abrt-d556705dd2948047d55d52e4c6cf921f276b2d77.zip |
Merge branch 'master' of ssh://vda@git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
-rw-r--r-- | src/Daemon/PluginManager.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp index 2f4d8750..a75b48ba 100644 --- a/src/Daemon/PluginManager.cpp +++ b/src/Daemon/PluginManager.cpp @@ -205,7 +205,19 @@ void CPluginManager::RegisterPlugin(const char *pName) CPlugin* plugin = abrt_plugin->second->PluginNew(); map_plugin_settings_t pluginSettings; - LoadPluginSettings(ssprintf(PLUGINS_CONF_DIR"/%s."PLUGINS_CONF_EXTENSION, pName).c_str(), pluginSettings); + if ((strcmp(pName, "Kerneloops") == 0) + || (strcmp(pName, "KerneloopsReporter") == 0) + || (strcmp(pName, "KerneloopsScanner") == 0) + ) + { + LoadPluginSettings(PLUGINS_CONF_DIR"/Kerneloops."PLUGINS_CONF_EXTENSION, pluginSettings); + VERB3 log("Load kerneloops.conf settings"); + } + else + { + LoadPluginSettings(ssprintf(PLUGINS_CONF_DIR"/%s."PLUGINS_CONF_EXTENSION, pName).c_str(), pluginSettings); + VERB3 log("Load %s.conf settings", pName); + } try { plugin->Init(); |