fixed debuginfo-install checks

2 files changed, 7 insertions, 5 deletions

diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index 9d1fd43..8d69e32 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -115,7 +115,7 @@ void CMiddleWare::CreateReport(const std::string& pAnalyzer,
     CAnalyzer* analyzer = m_pPluginManager->GetAnalyzer(pAnalyzer);
     return analyzer->CreateReport(pDebugDumpDir);
 }
-#include <iostream>
+
 void CMiddleWare::CreateCrashReport(const std::string& pUUID,
                                     const std::string& pUID,
                                     map_crash_report_t& pCrashReport)
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 95a9fff..6f1cf18 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -126,6 +126,7 @@ void CAnalyzerCCpp::InstallDebugInfos(const std::string& pPackage)
     close(pipeout[1]);
 
     bool quit = false;
+    bool already_installed = false;
 
     while(!quit)
     {
@@ -152,11 +153,12 @@ void CAnalyzerCCpp::InstallDebugInfos(const std::string& pPackage)
                     if (strstr(buff, packageName.c_str()) != NULL &&
                         strstr(buff, "already installed and latest version") != NULL)
                     {
-                        break;
+                        already_installed = true;
                     }
-                    if (strstr(buff, "No debuginfo packages available to install") != NULL ||
-                        strstr(buff, "Could not find debuginfo for main pkg") != NULL ||
-                        strstr(buff, "Could not find debuginfo pkg for dependency package") != NULL)
+                    if (already_installed == false &&
+                        (strstr(buff, "No debuginfo packages available to install") != NULL ||
+                         strstr(buff, "Could not find debuginfo for main pkg") != NULL ||
+                         strstr(buff, "Could not find debuginfo pkg for dependency package") != NULL))
                     {
                         close(pipein[1]);
                         close(pipeout[0]);