Explicitly pass overwrite=True to add_file. (It is the default, but this is clearer.)
authorDaira Hopwood <daira@jacaranda.org>
Mon, 8 Jun 2015 22:28:49 +0000 (23:28 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Wed, 30 Sep 2015 15:45:21 +0000 (16:45 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/drop_upload.py

index 452b92ceb656830f284e8f99c589b277034c61bd..388104f5d37285504121517e40e1be8450b1af4b 100644 (file)
@@ -205,13 +205,13 @@ class DropUploader(service.MultiService):
 
         def _add_file(name):
             u = FileName(path, self._convergence)
-            return self._parent.add_file(name, u)
+            return self._parent.add_file(name, u, overwrite=True)
 
         def _add_dir(name):
             self._notifier.watch(to_filepath(path), mask=self.mask, callbacks=[self._notify], recursive=True)
             u = Data("", self._convergence)
             name += "@_"
-            d2 = self._parent.add_file(name, u)
+            d2 = self._parent.add_file(name, u, overwrite=True)
             def _succeeded(ign):
                 self._log("created subdirectory %r" % (path,))
                 self._stats_provider.count('drop_upload.directories_created', 1)