summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/installer/packagemanagercore.cpp8
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp2
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;
}