[Pkg-owncloud-commits] [owncloud-client] 154/219: 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 dad8c1c27c535c9c90d6ae055f4468dc0f979619
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Sep 24 16:40:33 2014 +0200

    propagator: Do not check for case clash when renaming
    
    Issue #1385
    
    When renaming, we would normaly already have an error if the file already exist.
    And we want to allow the renaming to chang ethe case (Eg. "hello" -> "HELLO"
---
 src/mirall/propagatorjobs.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/mirall/propagatorjobs.cpp b/src/mirall/propagatorjobs.cpp
index dad244c..619950b 100644
--- a/src/mirall/propagatorjobs.cpp
+++ b/src/mirall/propagatorjobs.cpp
@@ -247,13 +247,6 @@ 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