From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 3 Nov 2015 03:03:33 +0000 (+0000)
Subject: Fix some miscapture bugs.
X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=61cbd68666a4514d917064e03d9405b33e252b20;p=tahoe-lafs%2Ftahoe-lafs.git

Fix some miscapture bugs.

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 81502467..1be3e683 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -630,9 +630,9 @@ class Downloader(QueueMixin, WriteFileMixin):
             for dir_name in dirmap:
                 (dirnode, metadata) = dirmap[dir_name]
                 if dirnode.get_readonly_uri() != self._upload_readonly_dircap:
-                    d2.addCallback(lambda ign, dir_name=dir_name:
+                    d2.addCallback(lambda ign, dir_name=dir_name, dirnode=dirnode:
                                    self._scan_remote_dmd(dir_name, dirnode, scan_batch))
-                    def _err(f):
+                    def _err(f, dir_name=dir_name):
                         self._log("failed to scan DMD for client %r: %s" % (dir_name, f))
                         # XXX what should we do to make this failure more visible to users?
                     d2.addErrback(_err)