summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/packagemanagercore.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-07-29 00:06:44 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-07-29 08:45:12 +0200
commit11799d10360c276647d77d986dd9a2dd3503c5d5 (patch)
tree21e9872926536e958665c35caf7c66570d58952a /installerbuilder/libinstaller/packagemanagercore.cpp
parent1bda94ebd93a7a075e4c4a31e4352bb78aaf262c (diff)
calculate dependencies only if it is needed
Diffstat (limited to 'installerbuilder/libinstaller/packagemanagercore.cpp')
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index bb6a8e469..9ec9dd6ce 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -822,8 +822,6 @@ QList<Component*> PackageManagerCore::rootComponents() const
QList<Component*> PackageManagerCore::orderedComponentsToInstall() const
{
- if (!d->isInstallComponentsOrderCalculated)
- calculateToInstallComponents(runMode());
return d->m_orderedToInstallComponents;
}
@@ -832,16 +830,16 @@ QString PackageManagerCore::installReason(Component* component) const
return d->installReason(component);
}
-bool PackageManagerCore::calculateToInstallComponents(RunMode runMode) const
+bool PackageManagerCore::calculateToInstallComponents() const
{
d->clearComponentsToInstall();
QList<Component*> components;
- if (runMode == UpdaterMode) {
+ if (runMode() == UpdaterMode) {
foreach(Component* component, updaterComponents()) {
if (component->updateRequested())
components.append(component);
}
- } else if (runMode == AllMode) {
+ } else if (runMode() == AllMode) {
foreach(Component* component, availableComponents()) {
if (component->installationRequested())
components.append(component);