From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 17 Sep 2015 15:13:36 +0000 (+0100)
Subject: Fix relative path calculation WIP.
X-Git-Url: https://git.rkrishnan.org/pf/content/en/footer/provisioning?a=commitdiff_plain;h=633002d85650033d4e4906b5d6de56e7b039db4d;p=tahoe-lafs%2Ftahoe-lafs.git

Fix relative path calculation WIP.

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 bb7a00de..1b30dd7f 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -121,7 +121,10 @@ class QueueMixin(HookMixin):
         return unicode_from_filepath(self._local_filepath.preauthChild(relpath_u))
 
     def _get_relpath(self, filepath):
-        return u"/".join(filepath.segmentsFrom(self._local_filepath))
+        print "_get_relpath(%r)" % (filepath,)
+        segments = filepath.asTextMode().segmentsFrom(self._local_filepath.asTextMode())
+        print "segments = %r" % (segments,)
+        return u"/".join(segments)
 
     def _count(self, counter_name, delta=1):
         self._client.stats_provider.count('magic_folder.%s.%s' % (self._name, counter_name), delta)