From 08382028926bf1d8c7a3fbf1b7d9c69e43ed5bb1 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Tue, 29 Sep 2015 23:31:23 +0100 Subject: [PATCH] [#2703] [Core] Stop moving files if target files exist --- deluge/core/torrent.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 33193c4dc..8d28e3c4b 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -1089,10 +1089,11 @@ class Torrent(object): try: # libtorrent needs unicode object if wstrings are enabled, utf8 bytestring otherwise + # Keyword argument flags=1 (fail_if_exist) stops overwriting of target files. try: - self.handle.move_storage(dest) + self.handle.move_storage(dest, flags=1) except TypeError: - self.handle.move_storage(utf8_encoded(dest)) + self.handle.move_storage(utf8_encoded(dest), flags=1) except RuntimeError as ex: log.error("Error calling libtorrent move_storage: %s", ex) return False