From: Daira Hopwood Date: Wed, 30 Sep 2015 15:16:08 +0000 (+0100) Subject: Don't hardcode the encoded form of "/". X-Git-Url: https://git.rkrishnan.org/listings/pb2server.py?a=commitdiff_plain;h=refs%2Fheads%2F2506.enforce-paths.2;p=tahoe-lafs%2Ftahoe-lafs.git Don't hardcode the encoded form of "/". Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 50d06bc4..422a7c11 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -317,7 +317,7 @@ class Uploader(QueueMixin): elif pathinfo.isdir: self._notifier.watch(fp, mask=self.mask, callbacks=[self._notify], recursive=True) uploadable = Data("", self._client.convergence) - encoded_name_u += u"@_" + encoded_path_u += magicpath.path2magic(u"/") upload_d = self._upload_dirnode.add_file(encoded_path_u, uploadable, metadata={"version":0}, overwrite=True) def _succeeded(ign): self._log("created subdirectory %r" % (relpath_u,))