Don't download the deletion marker file unnecessarily.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-27 17:10:15 +00:00
parent a7ef6948d9
commit 243c89204d

View 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))