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:
455d030
)
Fix indentation
author
David Stainton
<dstainton415@gmail.com>
Mon, 26 Oct 2015 19:30:28 +0000
(20:30 +0100)
committer
Daira Hopwood
<daira@jacaranda.org>
Tue, 27 Oct 2015 15:13:40 +0000
(15:13 +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 e4baef540bd31f3a1d8bc63ee6a5fea2bed12c54..de5c9b98408963f64a06a898b16fd552473db6d4 100644
(file)
--- a/
src/allmydata/frontends/magic_folder.py
+++ b/
src/allmydata/frontends/magic_folder.py
@@
-689,7
+689,7
@@
class Downloader(QueueMixin, WriteFileMixin):
print "metadata %r" % (metadata,)
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
+ is_conflict = True
#dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
#local_last_uploaded_uri = ...