X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Ffrontends%2Fmagic_folder.py;h=52a146bb53a037f5310dab282d500d277d04b43f;hb=f9edf04eb57d7b7336e9294c986fe0482fe9c822;hp=1be3e683adf3b9e8eb003093982b0c18521613e0;hpb=b483a1122f6aeb34a5adf0f155f2d96d845af711;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 1be3e683..52a146bb 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -707,10 +707,12 @@ class Downloader(QueueMixin, WriteFileMixin):
                     if dmd_last_downloaded_uri != local_last_downloaded_uri:
                         is_conflict = True
                         self._count('objects_conflicted')
-
-                #dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
-                #local_last_uploaded_uri = ...
-
+                    else:
+                        dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
+                        local_last_uploaded_uri = self._db.get_last_uploaded_uri(relpath_u)
+                        if dmd_last_uploaded_uri != local_last_uploaded_uri:
+                            is_conflict = True
+                            self._count('objects_conflicted')
             if relpath_u.endswith(u"/"):
                 if metadata.get('deleted', False):
                     self._log("rmdir(%r) ignored" % (abspath_u,))