From 9bf392c1e096f9b62b8994508c75fefc0a9a55c7 Mon Sep 17 00:00:00 2001 From: David Stainton <dstainton415@gmail.com> Date: Mon, 26 Oct 2015 21:59:56 +0100 Subject: [PATCH] Count conflicted objects --- src/allmydata/frontends/magic_folder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 8d34bddd..61202003 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -690,6 +690,8 @@ class Downloader(QueueMixin, WriteFileMixin): print "<<<<--- if %r != %r" % (dmd_last_downloaded_uri, local_last_downloaded_uri) if dmd_last_downloaded_uri is not None and dmd_last_downloaded_uri != local_last_downloaded_uri: is_conflict = True + self._count('objects_conflicted') + #dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None) #local_last_uploaded_uri = ... -- 2.45.2