[Pkg-owncloud-commits] [owncloud-client] 19/83: Fix/cleanup PropagateLocalMkDir::start()

[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 b995cd318cc00b84056209ebf29f3fcf32b21956
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu May 22 10:16:33 2014 +0200

    Fix/cleanup PropagateLocalMkDir::start()
---
 src/mirall/propagatorjobs.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mirall/propagatorjobs.cpp b/src/mirall/propagatorjobs.cpp
index 1019538..42ed45d 100644
--- a/src/mirall/propagatorjobs.cpp
+++ b/src/mirall/propagatorjobs.cpp
@@ -104,15 +104,16 @@ void PropagateLocalMkdir::start()
     if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
         return;
 
-    QDir newDir( _propagator->_localDir + _item._file );
+    QDir newDir(_propagator->_localDir + _item._file);
+    QString newDirStr = QDir::toNativeSeparators(newDir.path());
     if(newDir.exists()) {
         qDebug() << "WARN: new directory to create locally already exists!";
-        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirName) );
+        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
         return;
     }
-    QDir d;
-    if (!d.mkpath( newDirName )) {
-        done( SyncFileItem::NormalError, tr("could not create directory %1").arg(newDirName) );
+    QDir localDir(_propagator->_localDir);
+    if (!localDir.mkpath(_item._file)) {
+        done( SyncFileItem::NormalError, tr("could not create directory %1").arg(newDirStr) );
         return;
     }
     done(SyncFileItem::Success);

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