diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-09-23 10:09:22 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-09-23 07:58:11 +0000 |
commit | 26297c5a623849c8f3d68dac0ef6570779f60f62 (patch) | |
tree | f282c5baed26b7ed61070b6b8e9c951e620b7b72 /src | |
parent | 79f6a4cdb7a759af14505c8b74ad6c47096607ac (diff) |
CLI: Prevent MT restart after MT is updated
Command line instance does not launch properly without user interaction.
In Windows, the maintenancetool was launched to the background without
GUI and CLI, in Linux the CLI does not take user inputs.
Task-number: QTIFW-1967
Change-Id: I5e6ebb40f7db37a70f8d0063cbe279f5cd26080b
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 8 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 183baf558..920ef0987 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -2314,10 +2314,12 @@ bool PackageManagerCore::updateComponentsSilently(const QStringList &componentsT if (!d->calculateComponentsAndRun()) return false; - if (essentialUpdatesFound) - qCDebug(QInstaller::lcInstallerInstallLog) << "Essential components updated successfully."; - else + if (essentialUpdatesFound) { + qCDebug(QInstaller::lcInstallerInstallLog) << "Essential components updated successfully." + " Please restart maintenancetool to update other components."; + } else { qCDebug(QInstaller::lcInstallerInstallLog) << "Components updated successfully."; + } } return true; } diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 6bd25b822..da6ce66b9 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1976,7 +1976,7 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr if (!ok && !ignoreError) throw Error(operation->errorString()); - if (component->value(scEssential, scFalse) == scTrue) + if ((component->value(scEssential, scFalse) == scTrue) && !m_core->isCommandLineInstance()) m_needsHardRestart = true; } |