summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-04-09 13:43:33 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-04-24 20:09:13 +0200
commitd7ce137c11ca63eebe816eedcda1fb1f058ad8bb (patch)
treef631e833c83fa27799598e341c9ca879dd609add /src
parent95f7ae882b192f728d9f6c316a03d0b781d0b5bc (diff)
Calculate the component order before using it.
Change-Id: Ic96b45f013e5f7f740677542ca07914adf7a48d2 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index c73a7fc82..8fcee1a7f 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -1499,6 +1499,7 @@ bool PackageManagerCorePrivate::runInstaller()
ProgressCoordinator::instance()->addManualPercentagePoints(1);
ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("Preparing the installation..."));
+ m_core->calculateComponentsToInstall();
const QList<Component*> componentsToInstall = m_core->orderedComponentsToInstall();
qDebug() << "Install size:" << componentsToInstall.size() << "components";
@@ -1510,7 +1511,7 @@ bool PackageManagerCorePrivate::runInstaller()
}
if (!adminRightsGained) {
- foreach (Component *component, m_core->orderedComponentsToInstall()) {
+ foreach (Component *component, componentsToInstall) {
if (component->value(scRequiresAdminRights, scFalse) == scFalse)
continue;