From 249de244b0cf228c5ae7e6656b5b1a5dfe7bd8cc Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 22 Sep 2015 16:46:43 +0100
Subject: [PATCH] Relative paths used by magic folder are '/'-separated on all
 platforms.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/allmydata/frontends/magic_folder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.45.2