From: Daira Hopwood Date: Tue, 15 Sep 2015 17:46:00 +0000 (+0100) Subject: Fix an import that broke during rebasing. X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/flags/(%5B%5E?a=commitdiff_plain;h=41bd1ac5561dc86a0366dfb4e5b9339375a8c315;p=tahoe-lafs%2Ftahoe-lafs.git Fix an import that broke during rebasing. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index da64d97d..859f6711 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -536,7 +536,7 @@ class Downloader(QueueMixin): d = file_node.download_best_version() def succeeded(res): d2 = defer.succeed(res) - absname = abspath_expanduser_unicode(name, base=self._local_path_u) + absname = fileutil.abspath_expanduser_unicode(name, base=self._local_path_u) d2.addCallback(lambda result: self._write_downloaded_file(absname, result, is_conflict=False)) def do_update_db(full_path): filecap = file_node.get_uri()