summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2022-03-24 12:53:38 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-25 07:27:11 +0000
commit38ac6276011d8e34560b67e256306b657fda2c1c (patch)
treecc575bf4a35bc79fd1f750dba6102d33e781a857
parentb22b7bdbb9a3d731520f7fa39b6d23942ff4b585 (diff)
downloadqtapplicationmanager-38ac6276011d8e34560b67e256306b657fda2c1c.tar.gz
Really fix package removal if documentDir is not set
The fix in bc06a04dd845d039ba802f94b5eae57519ec63a8 was not correct in the package removal case. Change-Id: I65645a1895b6e5cba6dfa6bd61be1b1a638fe67a Reviewed-by: Bernd Weimer <bernd.weimer@qt.io> (cherry picked from commit 074d1a70d273b72a369009a6105a7dcad2efc48b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/manager-lib/deinstallationtask.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/manager-lib/deinstallationtask.cpp b/src/manager-lib/deinstallationtask.cpp
index 740c6e36..f599d14c 100644
--- a/src/manager-lib/deinstallationtask.cpp
+++ b/src/manager-lib/deinstallationtask.cpp
@@ -104,7 +104,7 @@ void DeinstallationTask::execute()
ScopedRenamer docDirRename;
ScopedRenamer appDirRename;
- if (!m_keepDocuments || !m_documentPath.isEmpty()) {
+ if (!m_keepDocuments && !m_documentPath.isEmpty()) {
if (!docDirRename.rename(QDir(m_documentPath).absoluteFilePath(packageId()),
ScopedRenamer::NameToNameMinus)) {
throw Exception(Error::IO, "could not rename %1 to %1-").arg(docDirRename.baseName());