From fa2304d275ab2e84a0ed90d8ab8525d4a3e6a0b7 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 2 Nov 2015 22:00:47 +0000 Subject: [PATCH] Blah --- src/allmydata/frontends/magic_folder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 09b646d9..35db9597 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -123,6 +123,7 @@ class QueueMixin(HookMixin): self._turn_delay = 0 def _get_filepath(self, relpath_u): + self._log("_get_filepath(%r)" % (relpath_u,)) return extend_filepath(self._local_filepath, relpath_u.split(u"/")) def _get_relpath(self, filepath): @@ -299,6 +300,7 @@ class Uploader(QueueMixin): if relpath_u is None: return precondition(isinstance(relpath_u, unicode), relpath_u) + precondition(not relpath_u.endswith(u'/'), relpath_u) d = defer.succeed(None) @@ -357,7 +359,7 @@ class Uploader(QueueMixin): self._notifier.watch(fp, mask=self.mask, callbacks=[self._notify], recursive=True) uploadable = Data("", self._client.convergence) - _assert(encoded_path_u.endswith(magicpath.path2magic(u"/"))) + encoded_path_u += magicpath.path2magic(u"/") self._log("encoded_path_u = %r" % (encoded_path_u,)) upload_d = self._upload_dirnode.add_file(encoded_path_u, uploadable, metadata={"version":0}, overwrite=True) def _succeeded(ign): -- 2.45.2