[Pkg-owncloud-commits] [owncloud-client] 286/332: SocketAPI: Call csync_exclude with the relative path.

[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 40cebeedfcb330736aa541e91772b25209358b8a
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Aug 4 12:46:02 2014 +0200

    SocketAPI: Call csync_exclude with the relative path.
    
    This avoids messing with the windows pathes and csync_exclude is
    designed that way.
---
 src/mirall/socketapi.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 7874450..1f5c8c6 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -135,12 +135,7 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName )
         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);
+    CSYNC_EXCLUDE_TYPE excl = csync_excluded(folder->csyncContext(), fileName.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