[Pkg-owncloud-commits] [owncloud-client] 297/333: HACK to avoid continuation: See task #1448

[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 435e7e3eecbd2f097531fb9d6ffd91cdda68d0ad
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Apr 4 10:50:40 2014 +0200

    HACK to avoid continuation: See task #1448
    
    We do not know the _modtime from the server, at this point, so just set
    the current one.  (rather than the one locally)
---
 src/mirall/owncloudpropagator.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 655361b..86df5c4 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -19,6 +19,7 @@
 #include "propagator_qnam.h"
 #include "propagatorjobs.h"
 #include "propagator_legacy.h"
+#include "mirall/utility.h"
 
 #include <QStack>
 
@@ -97,6 +98,10 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
             } else if (downloadItem._instruction == CSYNC_INSTRUCTION_SYNC) {
                 // we modified the file locally, jsut create a conflict then
                 downloadItem._instruction = CSYNC_INSTRUCTION_CONFLICT;
+
+                // HACK to avoid continuation: See task #1448:  We do not know the _modtime from the
+                //  server, at this point, so just set the current one. (rather than the one locally)
+                downloadItem._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTime());
             } else {
                 // the file was removed or renamed, just recover the old one
                 downloadItem._instruction = CSYNC_INSTRUCTION_SYNC;

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