ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 19:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Stainton 2015-10-26 18:43:13 +01:00 committed by Daira Hopwood
parent 46a965164b
commit 276ff646c3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/frontends/magic_folder.py
View File

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