summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-07-27 14:05:49 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-07-27 14:26:16 +0200
commit936eb29903a8fa1e7908dc61054dd5d7b8fc8f2b (patch)
tree8fe6224e81c9f4bffca628b4fd7c69106cddaf2f /installerbuilder
parent66fedb5b22d570df0988a3e23df405d6b8d17ac2 (diff)
state check is not needed anymore since we have only two
Reviewed-By: Niels Weber
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/packagemanagercore_p.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 2dca4ab3a..f00ea9c13 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -400,9 +400,7 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component*
}
}
- if (state == WithoutDependenciesAppendToInstallState) {
- appendComponentsToInstall(notAppendedComponents, WithResolvedDependenciesAppendToInstallState);
- } else if (state == WithResolvedDependenciesAppendToInstallState && !notAppendedComponents.isEmpty()) {
+ if (!notAppendedComponents.isEmpty()) {
//try again to append the not appended component because the last appended ones could
//are the missing dependencies
appendComponentsToInstall(notAppendedComponents, WithResolvedDependenciesAppendToInstallState);