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:
97f01af
)
Move declaration of is_conflict to a smaller scope
author
David Stainton
<dstainton415@gmail.com>
Mon, 26 Oct 2015 17:41:47 +0000
(18:41 +0100)
committer
Daira Hopwood
<daira@jacaranda.org>
Tue, 27 Oct 2015 15:13:39 +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 2d2fc89e2dfe959f742c9139d035f28ac3316016..ef8b004a18cbe49738932fff7259b2f9f4e916f0 100644
(file)
--- a/
src/allmydata/frontends/magic_folder.py
+++ b/
src/allmydata/frontends/magic_folder.py
@@
-651,7
+651,6
@@
class Downloader(QueueMixin, WriteFileMixin):
def _process(self, item, now=None):
self._log("_process(%r)" % (item,))
- is_conflict = False
if now is None:
now = time.time()
(relpath_u, file_node, metadata) = item
@@
-684,6
+683,7
@@
class Downloader(QueueMixin, WriteFileMixin):
d.addCallback(fail)
else:
if self._db.check_file_db_exists(relpath_u):
+ is_conflict = False
dmd_last_downloaded_uri = metadata.get('last_downloaded_uri', None)
local_last_downloaded_uri = self._db.get_last_downloaded_uri(relpath_u)
print "metadata %r" % (metadata,)