From: David Stainton Date: Mon, 26 Oct 2015 17:41:47 +0000 (+0100) Subject: Move declaration of is_conflict to a smaller scope X-Git-Url: https://git.rkrishnan.org/%5B/frontends/flags/configuration.rst?a=commitdiff_plain;h=46a965164b5d1898572d78b0814a26794cdd2931;p=tahoe-lafs%2Ftahoe-lafs.git Move declaration of is_conflict to a smaller scope --- 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,)