Fix declaration of is_conflict

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 7ae36b17ec4759f426d4e14dc9c7c00f2d5a582d..e4baef540bd31f3a1d8bc63ee6a5fea2bed12c54 100644 (file)
--- 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,)