[Pkg-owncloud-commits] [owncloud-client] 52/83: Add check for case clash for legacy propagator download.

[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 f1b2417967bb45ae3aafe37b096a05aacfebef6d
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon May 26 17:53:26 2014 +0200

    Add check for case clash for legacy propagator download.
---
 src/mirall/propagator_legacy.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/mirall/propagator_legacy.cpp b/src/mirall/propagator_legacy.cpp
index 507b0a1..6d3ffd5 100644
--- a/src/mirall/propagator_legacy.cpp
+++ b/src/mirall/propagator_legacy.cpp
@@ -444,6 +444,13 @@ void PropagateDownloadFileLegacy::start()
     if (_propagator->_abortRequested.fetchAndAddRelaxed(0))
         return;
 
+    // do a case clash check.
+    if( _propagator->localFileNameClash(_item._file) ) {
+        done( SyncFileItem::NormalError, tr("File %1 can not be downloaded because of a local file name clash!")
+              .arg(QDir::toNativeSeparators(_item._file)) );
+        return;
+    }
+
     emit progress(_item, 0);
 
     QString tmpFileName;

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