diff options
| author | dnovotny <danny@rawhide.localdomain> | 2009-09-16 10:59:23 -0400 |
|---|---|---|
| committer | dnovotny <danny@rawhide.localdomain> | 2009-09-16 10:59:23 -0400 |
| commit | 440ba3ddc846d94eed516ee62541ebbf2354131d (patch) | |
| tree | c27c23fd03d8b02954afee0ba0a64ec3308a31b0 /lib/Plugins/CCpp.cpp | |
| parent | 99dff4e51dc05e9313085334f5c09dcf36ca8b94 (diff) | |
| download | abrt-440ba3ddc846d94eed516ee62541ebbf2354131d.tar.gz abrt-440ba3ddc846d94eed516ee62541ebbf2354131d.tar.xz abrt-440ba3ddc846d94eed516ee62541ebbf2354131d.zip | |
merge correction
Diffstat (limited to 'lib/Plugins/CCpp.cpp')
| -rw-r--r-- | lib/Plugins/CCpp.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index 76858eb..8e99beb 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -551,12 +551,10 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir) { update_client(_("Starting report creation...")); -<<<<<<< HEAD std::string package; std::string backtrace; std::string UID; -======= ->>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29 + CDebugDump dd; dd.Open(pDebugDumpDir); bool bt_exists = dd.Exist(FILENAME_BACKTRACE); @@ -565,12 +563,11 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir) { return; /* already done */ } -<<<<<<< HEAD + dd.LoadText(FILENAME_PACKAGE, package); dd.LoadText(FILENAME_UID, UID); dd.Close(); -======= ->>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29 + map_plugin_settings_t settings = GetSettings(); if (settings["InstallDebuginfo"] == "yes" && |