[Pkg-owncloud-commits] [owncloud-client] 01/83: Detect directory case sensitivity clash on windows

[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 43fe7b0d5550019c49e3b8fe8e606bc7a44f8075
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri May 16 15:20:32 2014 +0200

    Detect directory case sensitivity clash on windows
---
 src/mirall/propagatorjobs.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mirall/propagatorjobs.cpp b/src/mirall/propagatorjobs.cpp
index 85c47f5..c6efed3 100644
--- a/src/mirall/propagatorjobs.cpp
+++ b/src/mirall/propagatorjobs.cpp
@@ -104,9 +104,17 @@ void PropagateLocalMkdir::start()
     if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
         return;
 
+    QString newDirName( _propagator->_localDir + _item._file );
+    QDir newDir( newDirName );
+    QString sysDirName = newDir.dirName();
+    if( newDir.exists() && ! _item._file.endsWith(sysDirName,  Qt::CaseSensitive)) {
+        qDebug() << "WARN: new directory to create locally already exists!";
+        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirName) );
+        return;
+    }
     QDir d;
-    if (!d.mkpath(_propagator->_localDir +  _item._file)) {
-        done(SyncFileItem::NormalError, tr("could not create directory %1").arg(_propagator->_localDir +  _item._file));
+    if (!d.mkpath( newDirName )) {
+        done( SyncFileItem::NormalError, tr("could not create directory %1").arg(newDirName) );
         return;
     }
     done(SyncFileItem::Success);

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