]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Fix an oversight when joining paths.
authorDaira Hopwood <daira@jacaranda.org>
Wed, 23 Sep 2015 13:49:31 +0000 (14:49 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Wed, 30 Sep 2015 15:45:27 +0000 (16:45 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

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