[Pkg-owncloud-commits] [owncloud-client] 34/175: Propagator: Mention name of conflict file (for debugging)

[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 cdfafa2180bc44ced078afabde57995a2d4f03c6
Author: Markus Goetz <markus at woboq.com>
Date:   Tue May 12 17:10:53 2015 +0200

    Propagator: Mention name of conflict file (for debugging)
---
 src/libsync/propagatedownload.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index a033748..65fc409 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -532,6 +532,7 @@ void PropagateDownloadFileQNAM::downloadFinished()
             done(SyncFileItem::SoftError, renameError);
             return;
         }
+        qDebug() << "Created conflict file" << fn << "->" << conflictFileName;
     }
 
     FileSystem::setModTime(_tmpFile.fileName(), _item._modtime);

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