Revert patch to fix "nextcloud enters busy loop when using a share on NTFS"

Closes: #1091614

diff --git a/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch b/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
new file mode 100644 (file)
index 0000000..745eaf9
--- /dev/null
+++ b/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
@@ -0,0 +1,41 @@
+From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee@debian.org>
+Date: Sun, 5 Jan 2025 20:33:16 +0100
+Subject: Revert "better logs and factor common code in folder permissions
+ handling"
+
+This reverts commit 1417e8cb60e84762f94345b21d587fb54bc90b51.
+---
+ src/libsync/owncloudpropagator.cpp | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
+index ceb41fd..f10fc61 100644
+--- a/src/libsync/owncloudpropagator.cpp
++++ b/src/libsync/owncloudpropagator.cpp
+@@ -1474,18 +1474,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+                 }
+             } else {
+                 try {
+-                    const auto permissionsChangeHelper = [] (const auto fileName)
+-                    {
+-                        qCDebug(lcDirectory) << fileName << "permissions changed: old permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
+-                        FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadWrite);
+-                        qCDebug(lcDirectory) << fileName << "applied new permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
+-                    };
+-
+-                    if (const auto fileName = propagator()->fullLocalPath(_item->_file); FileSystem::fileExists(fileName)) {
+-                        permissionsChangeHelper(fileName);
++                    if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
++                        qCDebug(lcDirectory) << propagator()->fullLocalPath(_item->_file) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
++                        FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadWrite);
++                        qCDebug(lcDirectory) << propagator()->fullLocalPath(_item->_file) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
+                     }
+-                    if (const auto fileName = propagator()->fullLocalPath(_item->_renameTarget); !_item->_renameTarget.isEmpty() && FileSystem::fileExists(fileName)) {
+-                        permissionsChangeHelper(fileName);
++                    if (!_item->_renameTarget.isEmpty() && FileSystem::fileExists(propagator()->fullLocalPath(_item->_renameTarget))) {
++                        qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
++                        FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_renameTarget), FileSystem::FolderPermissions::ReadWrite);
++                        qCDebug(lcDirectory) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
+                     }
+                 }
+                 catch (const std::filesystem::filesystem_error &e)

diff --git a/debian/patches/series b/debian/patches/series
index bf0d0b95e5b6d9cdc5020073c8f4801a0b176717..19fadcd04ea05abb4804dc5e8b4532524fb011d7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Use-release-version-for-Debian.patch
 0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
 0004-Don-t-use-GuiPrivate.patch
+0006-Revert-better-logs-and-factor-common-code-in-folder-.patch