From: Daira Hopwood <daira@jacaranda.org>
Date: Wed, 23 Sep 2015 13:49:31 +0000 (+0100)
Subject: Fix an oversight when joining paths.
X-Git-Url: https://git.rkrishnan.org/listings/frontends/FTP-and-SFTP.rst?a=commitdiff_plain;h=46858a63543820349c348d084f1dbfd842da0095;p=tahoe-lafs%2Ftahoe-lafs.git

Fix an oversight when joining paths.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 17be7570..10b56d8a 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -247,7 +247,8 @@ class Uploader(QueueMixin):
         d = defer.succeed(None)
         for child in children:
             assert isinstance(child, unicode), child
-            d.addCallback(lambda ign, child=child: "%s/%s" % (reldir_u, child))
+            d.addCallback(lambda ign, child=child:
+                          ("%s/%s" % (reldir_u, child) if reldir_u else child))
             def _add_pending(relpath_u):
                 self._pending.add(relpath_u)
                 return relpath_u