summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore_p.cpp
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2022-01-20 11:33:51 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2022-01-20 14:43:53 +0200
commitadd344ee43670a87212639f979ad9a672291076e (patch)
tree808ed62d2a4de47bd274fe45976f141e0c76e1e6 /src/libs/installer/packagemanagercore_p.cpp
parent212c3c4f122ea921336137c7987a9c866c5cc347 (diff)
MT: Fix setting incorrect TargetDir value when started as root
Maintenance tool was using the vendor configured default target directory for system wide installations instead of the actual application path. In addition to possibly several other things breaking as the variable is used extensively by the framework, this would make the installation appear corrupted as the local package hub file could not be read from the incorrect location. Task-number: QTIFW-2486 Change-Id: I31676e57d83409022e6908e64fac636b12d8262d Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 08e382e7d..154f2f638 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -611,7 +611,7 @@ void PackageManagerCorePrivate::initialize(const QHash<QString, QString> &params
m_componentsToInstallCalculated = false;
#ifdef Q_OS_LINUX
- if (m_launchedAsRoot)
+ if (m_launchedAsRoot && isInstaller())
m_data.setValue(scTargetDir, replaceVariables(m_data.settings().adminTargetDir()));
#endif