diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-10-18 07:41:44 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-10-23 14:29:00 +0200 |
| commit | 76039e40dad87917735c1fec9d33aec6df0f47cd (patch) | |
| tree | 658953650c1a054257259d37c9b0a5fd93e3b473 /src/libs/installer/packagemanagercore_p.cpp | |
| parent | d6dd1b7a4aa903748139e40cd55ca15d52935fa6 (diff) | |
rename forceRestart to needsHardRestart
Change-Id: Ic3e3b6733f3d4e7bbf7b9a2715fd2d74fb3f9a2d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 7cd2c292c..dc6b775f1 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -225,7 +225,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q , m_updaterApplication(new DummyConfigurationInterface) , m_FSEngineClientHandler(initFSEngineClientHandler()) , m_status(PackageManagerCore::Unfinished) - , m_forceRestart(false) + , m_needsHardRestart(false) , m_testChecksum(false) , m_launchedAsRoot(AdminAuthorization::hasAdminRights()) , m_completeUninstall(false) @@ -1290,7 +1290,7 @@ void PackageManagerCorePrivate::writeUninstaller(OperationList performedOperatio writeUninstallerBinary(&replacementBinary, replacementBinary.size(), true); qDebug() << "Wrote the binary with the new replacement."; - m_forceRestart = true; + m_needsHardRestart = true; newBinaryWritten = true; replacementExists = true; } catch (const Error &error) { @@ -1911,7 +1911,7 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr throw Error(operation->errorString()); if (component->value(scEssential, scFalse) == scTrue) - m_forceRestart = true; + m_needsHardRestart = true; } registerPathesForUninstallation(component->pathesForUninstallation(), component->name()); |