[Pkg-owncloud-commits] [owncloud-client] 60/84: ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit 1040e7b57b2355b75882d48e2179fa612653857b
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Sat Sep 10 17:08:52 2016 +0200

    ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
    
    If the folder has different case in the settings and in the FS, we should
    not ignore all the files. This is important for the files system watcher.
    
    (cherry picked from commit 98268d102fb343c103cbb4fb28dedd390f3c9ecf)
---
 src/libsync/excludedfiles.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libsync/excludedfiles.cpp b/src/libsync/excludedfiles.cpp
index b2839d0..6af6d8a 100644
--- a/src/libsync/excludedfiles.cpp
+++ b/src/libsync/excludedfiles.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "excludedfiles.h"
+#include "utility.h"
 
 #include <QFileInfo>
 
@@ -63,7 +64,7 @@ bool ExcludedFiles::isExcluded(
         const QString& basePath,
         bool excludeHidden) const
 {
-    if (!filePath.startsWith(basePath)) {
+    if (!filePath.startsWith(basePath, Utility::fsCasePreserving() ? Qt::CaseInsensitive : Qt::CaseSensitive)) {
         // Mark paths we're not responsible for as excluded...
         return true;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git