From 46a965164b5d1898572d78b0814a26794cdd2931 Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton415@gmail.com>
Date: Mon, 26 Oct 2015 18:41:47 +0100
Subject: [PATCH] Move declaration of is_conflict to a smaller scope
---
src/allmydata/frontends/magic_folder.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 2d2fc89e..ef8b004a 100644
--- 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,)
--
2.45.2