ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 19:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move declaration of is_conflict to a smaller scope

Browse Source
This commit is contained in:
David Stainton 2015-10-26 18:41:47 +01:00 committed by Daira Hopwood
parent 97f01af358
commit 46a965164b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,)