From: Daira Hopwood Date: Tue, 22 Sep 2015 15:46:43 +0000 (+0100) Subject: Relative paths used by magic folder are '/'-separated on all platforms. X-Git-Url: https://git.rkrishnan.org/simplejson/rgr-080307.php?a=commitdiff_plain;h=6fb2204b5525566760416f072af8779af7a659c6;p=tahoe-lafs%2Ftahoe-lafs.git Relative paths used by magic folder are '/'-separated on all platforms. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 59087ca0..17be7570 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -247,7 +247,7 @@ class Uploader(QueueMixin): d = defer.succeed(None) for child in children: assert isinstance(child, unicode), child - d.addCallback(lambda ign, child=child: os.path.join(reldir_u, child)) + d.addCallback(lambda ign, child=child: "%s/%s" % (reldir_u, child)) def _add_pending(relpath_u): self._pending.add(relpath_u) return relpath_u