From: David Stainton <dstainton415@gmail.com>
Date: Mon, 26 Oct 2015 17:43:13 +0000 (+0100)
Subject: Replace nested if with an 'and' in the if condition...
X-Git-Url: https://git.rkrishnan.org/tahoe_css?a=commitdiff_plain;h=276ff646c3aa012d7dffacc2f6d9466ed1d393d3;p=tahoe-lafs%2Ftahoe-lafs.git

Replace nested if with an 'and' in the if condition...
---

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 = ...