[Pkg-owncloud-commits] [owncloud-client] 428/470: Merge remote-tracking branch 'origin/2.1' into 2.2

[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 be466b47b74bd54be5d805dda5a5895dc6c67550
Merge: 817e97c 11b1449
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Apr 29 08:52:17 2016 +0200

    Merge remote-tracking branch 'origin/2.1' into 2.2

 src/libsync/propagatedownload.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --cc src/libsync/propagatedownload.cpp
index 1a9d299,0dd9205..779fe5c
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@@ -546,8 -543,16 +546,16 @@@ void PropagateDownloadFileQNAM::slotGet
          return;
      }
  
+     if (_tmpFile.size() == 0 && _item->_size > 0) {
+         FileSystem::remove(_tmpFile.fileName());
+         done(SyncFileItem::NormalError,
+              tr("The downloaded file is empty despite the server announced it should have been %1.")
+                 .arg(Utility::octetsToString(_item->_size)));
+         return;
+     }
+ 
      // Do checksum validation for the download. If there is no checksum header, the validator
 -    // will also emit the validated() signal to continue the flow in slot downloadFinished()
 +    // will also emit the validated() signal to continue the flow in slot transmissionChecksumValidated()
      // as this is (still) also correct.
      ValidateChecksumHeader *validator = new ValidateChecksumHeader(this);
      connect(validator, SIGNAL(validated(QByteArray,QByteArray)),

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