use relevantComponentForAutoDependOne everywhere

  - even in the autodepend->dependency transform loop at the beginning of appendComponentsToInstall

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

1 files changed, 9 insertions, 10 deletions

diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 756e59249..b47f5af50 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -322,9 +322,17 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component*
         return true;
     }
 
+    QList<Component*> relevantComponentForAutoDependOn;
+    if (isUpdater())
+        relevantComponentForAutoDependOn = m_updaterComponents + m_updaterComponentsDeps;
+    else {
+        foreach (QInstaller::Component *component, m_rootComponents)
+            relevantComponentForAutoDependOn += component->childComponents(true, AllMode);
+    }
+
     //build a data structure to be able to use autodependency as normal dependency
     m_autoDependOnDependencies.clear();
-    foreach (Component *component, m_core->availableComponents()) {
+    foreach (Component *component, relevantComponentForAutoDependOn) {
         foreach (const QString componentName, component->autoDependencies()) {
             Component *componentWithAutoDependOnInspector = m_core->componentByName(componentName);
             if (componentWithAutoDependOnInspector != 0) {
@@ -359,15 +367,6 @@ 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, relevantComponentForAutoDependOn) {