]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Relative paths used by magic folder are '/'-separated on all platforms.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 22 Sep 2015 15:46:43 +0000 (16:46 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 22 Sep 2015 15:46:43 +0000 (16:46 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

index 59087ca0c5613c2beca264c0f9a96b07809cdee0..17be75703164737a938c048761d9484bb36a4f22 100644 (file)
@@ -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