Count conflicted objects

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 8d34bddd21b689c8e0eefeaa922f35b181fd1f0b..61202003456ad67d49651a494c28e58f2cb00537 100644 (file)
--- 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 = ...