use dependency solver to order the installed operations

 - in case of single updates the order of the installed operations
   were wrong, now we reorder that till we are using that code for
   the install order aswell
 - added initial autotest for the dependency resolve code

Task-number: QTIFW-318

Change-Id: If411a684cb02ef9e7d0316084075e86702bf839d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 46 insertions, 1 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 40ddf1c3a..17b7560aa 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -49,6 +49,7 @@
 #include "fileutils.h"
 #include "fsengineclient.h"
 #include "globals.h"
+#include "graph.h"
 #include "messageboxhandler.h"
 #include "packagemanagercore.h"
 #include "progresscoordinator.h"
@@ -1329,9 +1330,15 @@ void PackageManagerCorePrivate::writeUninstaller(OperationList performedOperatio
 #endif
         }
 
+        performedOperations = sortOperationsBasedOnComponentDependencies(
+            performedOperations);
+
+        m_core->setValue(QLatin1String("installedOperationAreSorted"), QLatin1String("true"));
+
         try {
             KDSaveFile file(dataFile + QLatin1String(".new"));
             openForWrite(&file, file.fileName());
+
             writeUninstallerBinaryData(&file, &input, performedOperations, layout);
             appendInt64(&file, MagicCookieDat);
             file.setPermissions(file.permissions() | QFile::WriteUser | QFile::ReadGroup
@@ -1612,8 +1619,14 @@ bool PackageManagerCorePrivate::runPackageUpdater()
         OperationList nonRevertedOperations;
         QHash<QString, Component *> componentsByName;
 
+        // order the operations in the right component dependency order
+        // next loop will save the needed operations in reverse order for uninstallation
+        OperationList performedOperationsOld = m_performedOperationsOld;
+        if (m_core->value(QLatin1String("installedOperationAreSorted")) != QLatin1String("true"))
+            performedOperationsOld = sortOperationsBasedOnComponentDependencies(m_performedOperationsOld);
+
         // build a list of undo operations based on the checked state of the component
-        foreach (Operation *operation, m_performedOperationsOld) {
+        foreach (Operation *operation, performedOperationsOld) {
             const QString &name = operation->value(QLatin1String("component")).toString();
             Component *component = componentsByName.value(name, 0);
             if (!component)
@@ -1664,6 +1677,7 @@ bool PackageManagerCorePrivate::runPackageUpdater()
                     continue;
             }
 
+            // uninstallation should be in reverse order so prepend it here
             undoOperations.prepend(operation);
             updateAdminRights |= operation->value(QLatin1String("admin")).toBool();
         }
@@ -2355,6 +2369,37 @@ void PackageManagerCorePrivate::connectOperationCallMethodRequest(Operation *con
     }
 }
 
+OperationList PackageManagerCorePrivate::sortOperationsBasedOnComponentDependencies(const OperationList &operationList)
+{
+    OperationList sortedOperations;
+    QHash<QString, OperationList> componentOperationHash;
+
+    // sort component unrelated operations to the beginning
+    foreach (Operation *operation, operationList) {
+        const QString componentName = operation->value(QLatin1String("component")).toString();
+        if (componentName.isEmpty())
+            sortedOperations.append(operation);
+        else {
+            OperationList componentOperationList = componentOperationHash.value(componentName);
+            componentOperationList.append(operation);
+            componentOperationHash.insert(operation->value(QLatin1String("component")).toString(),
+                componentOperationList);
+        }
+    }
+
+    // create the complete component graph
+    Graph<QString> componentGraph;
+    foreach (const Component* componentNode, m_core->availableComponents()) {
+        componentGraph.addNode(componentNode->name());
+        componentGraph.addEdges(componentNode->name(), componentNode->dependencies());
+    }
+
+    foreach (const QString &componentName, componentGraph.sort())
+        sortedOperations.append(componentOperationHash.value(componentName));
+
+    return sortedOperations;
+}
+
 void PackageManagerCorePrivate::handleMethodInvocationRequest(const QString &invokableMethodName)
 {
     QObject *obj = QObject::sender();