]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Don't hardcode the encoded form of "/". 2506.enforce-paths.4
authorDaira Hopwood <daira@jacaranda.org>
Wed, 30 Sep 2015 15:16:08 +0000 (16:16 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Thu, 1 Oct 2015 00:19:49 +0000 (01:19 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

index 50d06bc462964b4696c7e84bf3ab87eea741a839..422a7c113a436abca280e1a87b606f24f23fd8f7 100644 (file)
@@ -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,))