Don't download the deletion marker file unnecessarily.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 27 Oct 2015 17:10:15 +0000 (17:10 +0000)
committermeejah <meejah@meejah.ca>
Wed, 20 Jan 2016 08:30:17 +0000 (01:30 -0700)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

index 96156f60e9693c47ba0c8f6266c0262d02a2eaf9..f9e0433bcc0b6990cc656f4328113d34d45628b6 100644 (file)
@@ -712,10 +712,10 @@ class Downloader(QueueMixin, WriteFileMixin):
                     d.addCallback(lambda ign: fileutil.make_dirs(abspath_u))
                     d.addCallback(lambda ign: abspath_u)
             else:
-                d.addCallback(lambda ign: file_node.download_best_version())
                 if metadata.get('deleted', False):
                     d.addCallback(lambda ign: self._rename_deleted_file(abspath_u))
                 else:
+                    d.addCallback(lambda ign: file_node.download_best_version())
                     d.addCallback(lambda contents: self._write_downloaded_file(abspath_u, contents,
                                                                                is_conflict=is_conflict))