diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2014-10-10 12:03:21 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-11-04 11:37:28 +0100 |
| commit | 120368e321b01bcfd5859e21f36706dd8349cb05 (patch) | |
| tree | 363a05578eab1630212246d0a875ae8351fab46c /src/libs/installer/packagemanagercore.cpp | |
| parent | c6ae7c8a44d2dc6b0c4479ce4d965c364c2218ee (diff) | |
Fix the uninstaller calculator
Don't include dependencies which were not installed before.
Fix the "Cascade dependencies" test of "solver".
Change-Id: I807503840af5c841cde89fdbbfc3f6932d4787b8
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 792323086..adf38885d 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1251,11 +1251,10 @@ QList<Component*> PackageManagerCore::orderedComponentsToInstall() const Calculates a list of components to uninstall based on the current run mode. Auto installed dependencies are not yet resolved. The aboutCalculateComponentsToUninstall() signal is emitted before the calculation starts, the finishedCalculateComponentsToUninstall() signal once all - calculations are done. + calculations are done. Returns always true. */ bool PackageManagerCore::calculateComponentsToUninstall() const { - bool result = true; emit aboutCalculateComponentsToUninstall(); if (!isUpdater()) { // hack to avoid removing needed dependencies @@ -1269,10 +1268,10 @@ bool PackageManagerCore::calculateComponentsToUninstall() const d->clearUninstallerCalculator(); d->storeCheckState(); - result = d->uninstallerCalculator()->appendComponentsToUninstall(componentsToUninstall); + d->uninstallerCalculator()->appendComponentsToUninstall(componentsToUninstall); } emit finishedCalculateComponentsToUninstall(); - return result; + return true; } /*! |