From 455d03098b50a4ff440a141c8488e7a919f045a3 Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton415@gmail.com>
Date: Mon, 26 Oct 2015 19:00:05 +0100
Subject: [PATCH] Fix declaration of is_conflict
---
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 7ae36b17..e4baef54 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -682,8 +682,8 @@ class Downloader(QueueMixin, WriteFileMixin):
raise ConflictError("download failed: already conflicted: %r" % (relpath_u,))
d.addCallback(fail)
else:
+ is_conflict = False
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