ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-12 07:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Count conflicted objects

Browse Source
This commit is contained in:
David Stainton 2015-10-26 21:59:56 +01:00 committed by Daira Hopwood
parent 63ad778b7d
commit c33e918bbf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/frontends/magic_folder.py
View File

@ -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 = ...