diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-08-06 16:19:07 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-08-06 16:19:07 +0200 |
| commit | 84348ccea878d509f838927e1bf393e5443d3ac8 (patch) | |
| tree | d7dc8bdc80b18a6137f94415761ec95c1df8e005 /lib/Plugins/CCpp.cpp | |
| parent | 9a3268d970142f0dfb4e3e77c66c9637bf87fbda (diff) | |
| parent | 26c6665308b5a99d02308099118b23b2716dacc0 (diff) | |
| download | abrt-84348ccea878d509f838927e1bf393e5443d3ac8.tar.gz abrt-84348ccea878d509f838927e1bf393e5443d3ac8.tar.xz abrt-84348ccea878d509f838927e1bf393e5443d3ac8.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Conflicts:
lib/CommLayer/DBusServerProxy.h
Diffstat (limited to 'lib/Plugins/CCpp.cpp')
| -rw-r--r-- | lib/Plugins/CCpp.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index 026e15a..a47ca38 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -527,19 +527,20 @@ void CAnalyzerCCpp::Init() } if (m_sOldCorePattern[0] == '|') { - if (m_sOldCorePattern == CORE_PATTERN) - { - log("warning: %s already contains %s, " - "did abrt daemon crash recently?", - CORE_PATTERN_IFACE, CORE_PATTERN); - /* There is no point in "restoring" CORE_PATTERN_IFACE - * to CORE_PATTERN on exit. Will restore to a default value: - */ - m_sOldCorePattern = "core"; - } - log("warning: %s was already set to run a crash analyser (%s), " - "abrt may interfere with it", - CORE_PATTERN_IFACE, CORE_PATTERN); + if (m_sOldCorePattern == CORE_PATTERN) + { + log("warning: %s already contains %s, " + "did abrt daemon crash recently?", + CORE_PATTERN_IFACE, CORE_PATTERN); + /* There is no point in "restoring" CORE_PATTERN_IFACE + * to CORE_PATTERN on exit. Will restore to a default value: + */ + m_sOldCorePattern = "core"; + } else { + log("warning: %s was already set to run a crash analyser (%s), " + "abrt may interfere with it", + CORE_PATTERN_IFACE, CORE_PATTERN); + } } std::ofstream fOutCorePattern; |