From: David Stainton Date: Mon, 26 Oct 2015 20:59:56 +0000 (+0100) Subject: Count conflicted objects X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri?a=commitdiff_plain;h=c4b54f7ffedba6b53b694340b876176e00fea8fe;p=tahoe-lafs%2Ftahoe-lafs.git Count conflicted objects --- 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 = ...