[Pkg-owncloud-commits] [owncloud-client] 43/78: Merge remote-tracking branch '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 e960b265a8adb3e78037ca29033860a5d7de870a
Merge: 1d93af5 f6b35e5
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed May 25 16:23:58 2016 +0200

    Merge remote-tracking branch '2.1' into 2.2

 CMakeLists.txt                        | 12 ++++++++++++
 src/libsync/propagatedownload.cpp     |  1 -
 src/libsync/syncengine.cpp            | 18 +++++++++++++++---
 src/libsync/syncjournaldb.cpp         | 19 +++++++++++++++----
 src/libsync/syncjournalfilerecord.cpp |  1 +
 src/libsync/syncjournalfilerecord.h   |  1 +
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --cc src/libsync/propagatedownload.cpp
index 17b2421,f3cce6b..3067883
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@@ -642,22 -642,11 +642,21 @@@ static void handleRecallFile(const QStr
          FileSystem::uncheckedRenameReplace(fpath, rpath, &error);
      }
  }
 +
 +static void preserveGroupOwnership(const QString& fileName, const QFileInfo& fi)
 +{
 +#ifdef Q_OS_UNIX
 +    chown(fileName.toLocal8Bit().constData(), -1, fi.groupId());
 +#else
 +    Q_UNUSED(fileName);
 +    Q_UNUSED(fi);
 +#endif
 +}
  } // end namespace
  
- 
  void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
  {
 -    const auto theContentChecksumType = QByteArray("SHA1");
 +    const auto theContentChecksumType = contentChecksumType();
  
      // Reuse transmission checksum as content checksum.
      //

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