autodependon should only checked on user available components

Change-Id: Icf130d76d339704cde18ee9853d82cb7a100534c
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index b82aa34e4..756e59249 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -359,9 +359,18 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component*
             return false;
     }
 
+    QList<Component*> relevantComponentForAutoDependOn;
+    if (isUpdater())
+        relevantComponentForAutoDependOn = m_updaterComponents + m_updaterComponentsDeps;
+    else {
+        foreach (QInstaller::Component *component, m_rootComponents)
+            relevantComponentForAutoDependOn += component->childComponents(true, AllMode);
+    }
+
+
     QList<Component*> foundAutoDependOnList;
     // All regular dependencies are resolved. Now we are looking for auto depend on components.
-    foreach (Component *component, m_core->availableComponents()) {
+    foreach (Component *component, relevantComponentForAutoDependOn) {
         // If a components is already installed or is scheduled for installation, no need to check for
         // auto depend installation.
         if ((!component->isInstalled() || component->updateRequested())