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

Only compare dmd_last_downloaded_uri if it's not None

Browse Source
This commit is contained in:
David Stainton 2015-10-26 15:14:21 +01:00 committed by Daira Hopwood
parent c2cd7d015c
commit 97f01af358
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,6 +651,7 @@ 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
@ -682,15 +683,14 @@ class Downloader(QueueMixin, WriteFileMixin):
raise ConflictError("download failed: already conflicted: %r" % (relpath_u,))
d.addCallback(fail)
else:
if not self._db.check_file_db_exists(relpath_u):
is_conflict = False
else:
# XXX
if self._db.check_file_db_exists(relpath_u):
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,)
print "<<<<--- if %r != %r" % (dmd_last_downloaded_uri, local_last_downloaded_uri)
if dmd_last_downloaded_uri != local_last_downloaded_uri:
is_conflict = True
if dmd_last_downloaded_uri is not None:
if 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 = ...