From 276ff646c3aa012d7dffacc2f6d9466ed1d393d3 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Mon, 26 Oct 2015 18:43:13 +0100 Subject: [PATCH] Replace nested if with an 'and' in the if condition... --- src/allmydata/frontends/magic_folder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index ef8b004a..e1df0a64 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -688,8 +688,7 @@ class Downloader(QueueMixin, WriteFileMixin): local_last_downloaded_uri = self._db.get_last_downloaded_uri(relpath_u) print "metadata %r" % (metadata,) print "<<<<--- if %r != %r" % (dmd_last_downloaded_uri, local_last_downloaded_uri) - if dmd_last_downloaded_uri is not None: - if dmd_last_downloaded_uri != local_last_downloaded_uri: + if dmd_last_downloaded_uri is not None and dmd_last_downloaded_uri != local_last_downloaded_uri: is_conflict = True #dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None) #local_last_uploaded_uri = ... -- 2.45.2