[Pkg-owncloud-commits] [owncloud-client] 93/498: Merge branch '1.9'

[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 08184d07cfc2d13f06f9f89a4dae0189e32ea155
Merge: 2a45ebd ac0e08c
Author: Markus Goetz <markus at woboq.com>
Date:   Tue May 12 23:03:45 2015 +0200

    Merge branch '1.9'

 csync/src/csync.c                     | 14 ++++++++++++++
 csync/src/csync_rename.cc             | 16 ++++++++++++++++
 csync/src/csync_rename.h              |  3 +++
 csync/tests/ownCloud/ownCloud/Test.pm |  3 ++-
 src/gui/application.cpp               |  4 ++--
 src/libsync/bandwidthmanager.cpp      |  4 ++--
 src/libsync/propagatedownload.cpp     |  1 +
 src/libsync/syncengine.cpp            | 11 ++++++-----
 test/testxmlparse.h                   |  8 ++++----
 9 files changed, 50 insertions(+), 14 deletions(-)

diff --cc src/libsync/propagatedownload.cpp
index 6962867,65fc409..d028624
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@@ -532,12 -532,13 +532,13 @@@ void PropagateDownloadFileQNAM::downloa
              done(SyncFileItem::SoftError, renameError);
              return;
          }
+         qDebug() << "Created conflict file" << fn << "->" << conflictFileName;
      }
  
 -    FileSystem::setModTime(_tmpFile.fileName(), _item._modtime);
 +    FileSystem::setModTime(_tmpFile.fileName(), _item->_modtime);
      // We need to fetch the time again because some file system such as FAT have a less than a second
      // Accuracy, and we really need the time from the file system. (#3103)
 -    _item._modtime = FileSystem::getModTime(_tmpFile.fileName());
 +    _item->_modtime = FileSystem::getModTime(_tmpFile.fileName());
  
      if (FileSystem::fileExists(fn)) {
          // Preserve the existing file permissions.

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