[Pkg-owncloud-commits] [owncloud-client] 113/211: Revert "propagator: Do not check for case clash when renaming"

[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 08156186fa3a14b89dd2648054e0d00947528233
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Oct 17 15:58:48 2014 +0200

    Revert "propagator: Do not check for case clash when renaming"
    
    This caused test regressions in t8.pl (#2318)
    
    This reverts commit dad8c1c27c535c9c90d6ae055f4468dc0f979619.
---
 src/mirall/propagatorjobs.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/mirall/propagatorjobs.cpp b/src/mirall/propagatorjobs.cpp
index 28ed08f..da784f7 100644
--- a/src/mirall/propagatorjobs.cpp
+++ b/src/mirall/propagatorjobs.cpp
@@ -247,6 +247,13 @@ void PropagateLocalRename::start()
         qDebug() << "MOVE " << _propagator->_localDir + _item._file << " => " << _propagator->_localDir + _item._renameTarget;
         QFile file(_propagator->_localDir + _item._file);
 
+        if (_propagator->localFileNameClash(_item._renameTarget)) {
+            // Fixme: the file that is the reason for the clash could be named here,
+            // it would have to come out the localFileNameClash function
+            done(SyncFileItem::NormalError, tr( "File %1 can not be renamed to %2 because of a local file name clash")
+                 .arg(QDir::toNativeSeparators(_item._file)).arg(QDir::toNativeSeparators(_item._renameTarget)) );
+            return;
+        }
         if (!file.rename(_propagator->_localDir + _item._file, _propagator->_localDir + _item._renameTarget)) {
             done(SyncFileItem::NormalError, file.errorString());
             return;

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