diff options
author | Katja Marttila <katja.marttila@qt.io> | 2022-05-03 11:59:21 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2022-05-16 10:05:20 +0300 |
commit | 21de5f081ab3b18625febcd8ac181f6a122c4c7f (patch) | |
tree | aafc927b1d4f379836aa2c7a386cfc04ca9b87b3 /src/libs/installer/uninstallercalculator.h | |
parent | 82c175d76f1c40868b47f18d95376dce34e0416e (diff) |
Do not install new dependencies for installed components
If component is updated to repository, and new dependencies are added,
the dependencies should be installed only when fresh install to
component is made or the component is updated.
This change adds a new LocalDependencies value to component. It keeps
track of the dependencies the local installed packages has.
Fixes also a bug in uninstallecalculator, where we should also read the
dependencies from local installed packages instead of newly introduced
repositories.
Task-number: QTIFW-2624
Change-Id: I0557e5adf1e87c0a1238cc455cfb2c90f6b05c87
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/uninstallercalculator.h')
-rw-r--r-- | src/libs/installer/uninstallercalculator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/uninstallercalculator.h b/src/libs/installer/uninstallercalculator.h index a458daa80..76e32c6a6 100644 --- a/src/libs/installer/uninstallercalculator.h +++ b/src/libs/installer/uninstallercalculator.h @@ -55,7 +55,7 @@ public: UninstallerCalculator(const QList<Component *> &installedComponents, PackageManagerCore *core, const AutoDependencyHash &autoDependencyComponentHash, - const DependencyHash &dependencyComponentHash, + const LocalDependencyHash &localDependencyComponentHash, const QStringList &localVirtualComponents); QSet<Component*> componentsToUninstall() const; @@ -78,7 +78,7 @@ private: PackageManagerCore *m_core; QHash<QString, QPair<UninstallReasonType, QString> > m_toUninstallComponentIdReasonHash; AutoDependencyHash m_autoDependencyComponentHash; - DependencyHash m_dependencyComponentHash; + LocalDependencyHash m_localDependencyComponentHash; QStringList m_localVirtualComponents; QList<Component *> m_virtualComponentsForReverse; }; |