projects
/
tahoe-lafs
/
tahoe-lafs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
137b66d
)
Count conflicted objects
author
David Stainton
<dstainton415@gmail.com>
Mon, 26 Oct 2015 20:59:56 +0000
(21:59 +0100)
committer
Daira Hopwood
<daira@jacaranda.org>
Mon, 25 Jan 2016 15:49:58 +0000
(15:49 +0000)
src/allmydata/frontends/magic_folder.py
patch
|
blob
|
history
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 = ...