added new dependency check

2 files changed, 8 insertions, 3 deletions

diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index a72c826e7..cccf0e8c7 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -297,7 +297,7 @@ QHash<QString, QPair<Component*, Component*> > &PackageManagerCorePrivate::compo
 
 void PackageManagerCorePrivate::clearComponentsToInstall() {
     m_orderedToInstallComponents.clear();
-    m_visitedDependencies.clear();
+    m_visitedComponents.clear();
     m_toInstallComponentIds.clear();
     m_toInstallComponentIdReasonHash.clear();
 }
@@ -351,11 +351,16 @@ bool PackageManagerCorePrivate::appendComponentToInstall(Component* component)
         if (!dependencyComponent->isInstalled()
             && !m_toInstallComponentIds.contains(dependencyComponent->name())) {
 
+            if (m_visitedComponents.value(component).contains(dependencyComponent))
+                return false;
+            m_visitedComponents[component].insert(dependencyComponent);
+
             //add needed dependency components to the next run
             insertInstallReason(dependencyComponent, QString(tr(
                 "added as dependency for %1")).arg(component->name()));
 
-            appendComponentToInstall(dependencyComponent);
+            if (!appendComponentToInstall(dependencyComponent))
+                return false;
         }
     }
     if (!m_toInstallComponentIds.contains(component->name())) {
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index 74788f7b9..11c4b6cdb 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
@@ -220,7 +220,7 @@ private:
     //calculate installation order variables
     QList<Component*> m_orderedToInstallComponents;
     QHash<QString, QString> m_toInstallComponentIdReasonHash; //for faster lookups
-    QSet<QString> m_visitedDependencies;
+    QHash<Component*, QSet<Component*> > m_visitedComponents;
 
     //in some cases we have the reason a while before we can it really,
     //so we can't use ReasonHash as a quick is allready added check