summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2020-09-17 11:55:42 +0300
committerKatja Marttila <katja.marttila@qt.io>2020-09-21 11:35:03 +0300
commit535dc058d67ce9600acc2e2c110f9917f9ef1add (patch)
tree6ae8cce8dee092e99965797ef485c2e5988daffc /src
parent07f39c58c8b6ad7eb42aa41302f63ec20737b967 (diff)
Exit early when trying to install already installed component
Task-number: QTIFW-1845 Change-Id: Iceea374ae4e027653c9e353fa2a4902e5fed790a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/packagemanagercore.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index e6b6de62b..183baf558 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -2398,11 +2398,21 @@ bool PackageManagerCore::removeInstallationSilently()
*/
bool PackageManagerCore::installSelectedComponentsSilently(const QStringList& components)
{
- // Check if there are processes running in the install if maintenancetool is in used.
if (!isInstaller()) {
+ // Check if there are processes running in the install if maintenancetool is used.
if (d->runningProcessesFound())
throw Error(tr("Running processes found."));
setPackageManager();
+
+ //Check that packages are not already installed
+ const LocalPackagesHash installedPackages = this->localInstalledPackages();
+ QStringList helperStrList;
+ helperStrList << components << installedPackages.keys();
+ helperStrList.removeDuplicates();
+ if (helperStrList.count() == installedPackages.count()) {
+ qCDebug(QInstaller::lcInstallerInstallLog) << "Components already installed.";
+ return true;
+ }
}
ComponentModel *model = defaultComponentModel();