diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-10-21 11:48:14 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-11-03 13:21:18 +0300 |
| commit | 9a7691eb7840395ed576b590eb6378023f030284 (patch) | |
| tree | 167ad25e615d21d67041b3baef7e7fd69959c90c /src | |
| parent | 07f4848b5ee0cdc9407d9a0de4d30ca5e03403e0 (diff) | |
CLI: Fix wrong warning text in command 'purge' for running processes
Task-number: QTIFW-1996
Change-Id: Iaf9aa6bfd39d266ed052838e969881c168b4b2ed
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 2 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 715374f65..ed658a2ed 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -2382,6 +2382,7 @@ PackageManagerCore::Status PackageManagerCore::uninstallComponentsSilently(const */ PackageManagerCore::Status PackageManagerCore::removeInstallationSilently() { + setCompleteUninstallation(true); if (d->runningProcessesFound()) throw Error(tr("Running processes found.")); @@ -2390,7 +2391,6 @@ PackageManagerCore::Status PackageManagerCore::removeInstallationSilently() qCDebug(QInstaller::lcInstallerInstallLog) << "Uninstallation aborted."; return status(); } - setCompleteUninstallation(true); if (run()) return PackageManagerCore::Success; else diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 8b08c3be1..4449509e5 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -2030,10 +2030,15 @@ bool PackageManagerCorePrivate::runningProcessesFound() //Check if there are processes running in the install QStringList excludeFiles = m_allowedRunningProcesses; excludeFiles.append(maintenanceToolName()); + + const QString performModeWarning = m_completeUninstall + ? QLatin1String("Unable to remove components.") + : QLatin1String("Unable to update components."); + QStringList runningProcesses = runningInstallerProcesses(excludeFiles); if (!runningProcesses.isEmpty()) { - qCWarning(QInstaller::lcInstallerInstallLog).noquote() << "Unable to update components. Please stop these processes: " - << runningProcesses << " and try again."; + qCWarning(QInstaller::lcInstallerInstallLog).noquote().nospace() << performModeWarning + << " Please stop these processes: " << runningProcesses << " and try again."; return true; } return false; |