[Pkg-owncloud-commits] [owncloud-client] 287/332: SocketAPI: Do not allow a trailing slash for directories.

[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 f983264b5d54d817f6fe383d05c6ff44625844b9
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Aug 4 12:47:03 2014 +0200

    SocketAPI: Do not allow a trailing slash for directories.
    
    The entries in our sync journal have no trailing slashes for directories.
---
 src/mirall/socketapi.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 1f5c8c6..88cd683 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -119,6 +119,11 @@ SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName )
         isSyncRootFolder = false;
     }
 
+    if( fileName.endsWith(QLatin1Char('/')) ) {
+        fileName.truncate(fileName.length()-1);
+        qDebug() << "Removed trailing slash: " << fileName;
+    }
+
     QFileInfo fi(file);
 
     if( !fi.exists() ) {

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