[Pkg-owncloud-commits] [owncloud-client] 218/332: SocketAPI: Exclude drive part from path blacklist check

[Sandro Knauß]

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

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

commit 72cd84e878fcb846fd0159f9b15963dbabb85ccd
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Jul 17 19:26:58 2014 +0200

    SocketAPI: Exclude drive part from path blacklist check
    
    Otherwise, it always matches the ':' part
---
 src/mirall/socketapi.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 60e5567..757a1ff 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -127,6 +127,11 @@ SyncFileStatus fileStatus(Folder *folder, const QString& fileName )
         type = CSYNC_FTW_TYPE_DIR;
     }
 
+    // on windows, there might be a colon in the file name.
+    QRegExp rx( "^[a-zA-Z]\\:[\\\\/]+");
+    if( file.contains(rx) ) {
+        file.remove(0, 2);
+    }
     CSYNC_EXCLUDE_TYPE excl = csync_excluded(folder->csyncContext(), file.toUtf8(), type);
     if( excl != CSYNC_NOT_EXCLUDED ) {
         return SyncFileStatus(SyncFileStatus::STATUS_IGNORE);

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