Merge branch '2438.magic-folder-stable.9' of https://github.com/tahoe-lafs/tahoe...

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / frontends / magic_folder.py

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 323e926f974a64b9348021306a194364dc38d774..bd226156d23b81c576b988c32d1babe63c3d3512 100644 (file)
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -619,10 +619,10 @@ class Downloader(QueueMixin, WriteFileMixin):
                     if 'version' not in result[1]:
                         self._log("invalid remote metadata detected")
                         continue
-                    else:
-                        if result[1]['version'] > max_version:
-                            node, metadata = result
-                            max_version = result[1]['version']
+
+                    if result[1]['version'] > max_version:
+                        node, metadata = result
+                        max_version = result[1]['version']
             return node, metadata
         collective_dirmap_d.addCallback(highest_version)
         return collective_dirmap_d
@@ -637,11 +637,12 @@ class Downloader(QueueMixin, WriteFileMixin):
 
                 file_node, metadata = listing_map[encoded_relpath_u]
                 local_version = self._get_local_latest(relpath_u)
+
                 if 'version' not in metadata:
                     self._log("invalid remote metadata detected for %r" % (relpath_u,))
                     continue
-                else:
-                    remote_version = metadata['version']
+
+                remote_version = metadata['version']
                 self._log("%r has local version %r, remote version %r" % (relpath_u, local_version, remote_version))
 
                 if local_version is None or local_version < remote_version: