From 4dc47e758145f022f1ddf64a892f74c6864555d3 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 27 Oct 2015 17:10:15 +0000 Subject: [PATCH] Don't download the deletion marker file unnecessarily. Signed-off-by: Daira Hopwood --- src/allmydata/frontends/magic_folder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 96156f60..f9e0433b 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -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)) -- 2.45.2