summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-06-05 13:36:09 +0300
committerKatja Marttila <katja.marttila@qt.io>2018-09-14 09:13:20 +0000
commit4d00ecb9778d05525416ed0ea0a5be9a8944ae88 (patch)
tree985ecd2df694ef8e52d78b3b26400f3054ec6bb8 /src/libs/installer
parentdd21b05b188ab8ee9aee43556d78d006ca9e7376 (diff)
Fix recursive error when there are unstable components
Change-Id: Iecaf849368904a72bae1a1ca6e51b45cfafb54ef Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/installercalculator.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libs/installer/installercalculator.cpp b/src/libs/installer/installercalculator.cpp
index 4e0d7fdfa..7767b5d96 100644
--- a/src/libs/installer/installercalculator.cpp
+++ b/src/libs/installer/installercalculator.cpp
@@ -95,8 +95,7 @@ QString InstallerCalculator::componentsToInstallError() const
void InstallerCalculator::realAppendToInstallComponents(Component *component, const QString &version)
{
- if (!component->isUnstable() &&
- (!component->isInstalled(version) || component->updateRequested())) {
+ if (!component->isInstalled(version) || component->updateRequested()) {
m_orderedComponentsToInstall.append(component);
m_toInstallComponentIds.insert(component->name());
}
@@ -173,7 +172,7 @@ bool InstallerCalculator::appendComponentToInstall(Component *component, const Q
m_componentsToInstallError.append(errorMessage);
if (component->packageManagerCore()->settings().allowUnstableComponents()) {
component->setUnstable();
- return true;
+ continue;
} else {
return false;
}