Fix QTSDK-954.

Download packages first before we run the undo operations.

Change-Id: I203c4b2dd16270a70f5a3e687ba1d33132e5d4d7
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 3b4b21f67..ae3078c55 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -1377,17 +1377,19 @@ void PackageManagerCorePrivate::runPackageUpdater()
             undoOperationProgressSize = double(1) / double(5);
             componentsInstallPartProgressSize = downloadPartProgressSize;
             undoOperationProgressSize /= countProgressOperations(undoOperations);
-
-            ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("Removing deselected components..."));
-            runUndoOperations(undoOperations, undoOperationProgressSize, adminRightsGained, true);
         }
-        m_performedOperationsOld = nonRevertedOperations; // these are all operations left: those not reverted
 
         ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("Preparing the installation..."));
 
         // following, we download the needed archives
         m_core->downloadNeededArchives(downloadPartProgressSize);
 
+        if (undoOperations.count() > 0) {
+            ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("Removing deselected components..."));
+            runUndoOperations(undoOperations, undoOperationProgressSize, adminRightsGained, true);
+        }
+        m_performedOperationsOld = nonRevertedOperations; // these are all operations left: those not reverted
+
         stopProcessesForUpdates(componentsToInstall);
 
         const double progressOperationCount = countProgressOperations(componentsToInstall);