summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-08-23 17:51:52 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-08-23 18:33:33 +0200
commitb8fb9911145cbbda0e080e5036211a8eb8ad144c (patch)
tree9948394fd23b4f3efeb948998bf20a8430d0e364 /installerbuilder
parent612bc01cca4315096339d8f0b4004f7351291c3e (diff)
added updateRequested that is all
Change-Id: I252c3f17c5e8208477c71c96960cb6c33e2caade Reviewed-on: http://codereview.qt.nokia.com/3422 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/packagemanagercore_p.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 0a2f23aad..21f434f83 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -341,7 +341,8 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component*
foreach (Component *component, m_core->availableComponents()) {
// If a components is already installed or is scheduled for installation, no need to check for
// auto depend installation.
- if (!component->isInstalled() && !m_toInstallComponentIds.contains(component->name())) {
+ if ((!component->isInstalled() || component->updateRequested())
+ && !m_toInstallComponentIds.contains(component->name())) {
// If we figure out a component requests auto installation, keep it to resolve their deps as
// well.
if (component->isAutoDependOn(m_toInstallComponentIds)) {
@@ -376,7 +377,7 @@ bool PackageManagerCorePrivate::appendComponentToInstall(Component *component)
return false;
}
- if (!dependencyComponent->isInstalled()
+ if ((!dependencyComponent->isInstalled() || dependencyComponent->updateRequested())
&& !m_toInstallComponentIds.contains(dependencyComponent->name())) {
if (m_visitedComponents.value(component).contains(dependencyComponent))
return false;