]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
The type of deque elements differs between the uploader and downloader.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 22 Sep 2015 15:40:53 +0000 (16:40 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Thu, 1 Oct 2015 00:19:49 +0000 (01:19 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

index 7f7b719d7f01ba0e11c7986f3f5e247894b5de4d..96250efde64aba03abea5e1ecae5749ab268760a 100644 (file)
@@ -152,12 +152,12 @@ class QueueMixin(HookMixin):
         if self._stopped:
             return
         try:
-            relpath_u = self._deque.pop()
+            item = self._deque.pop()
         except IndexError:
             self._log("deque is now empty")
             self._lazy_tail.addCallback(lambda ign: self._when_queue_is_empty())
         else:
-            self._lazy_tail.addCallback(lambda ign: self._process(relpath_u))
+            self._lazy_tail.addCallback(lambda ign: self._process(item))
             self._lazy_tail.addBoth(self._call_hook, 'processed')
             self._lazy_tail.addErrback(log.err)
             self._lazy_tail.addCallback(lambda ign: task.deferLater(reactor, self._turn_delay, self._turn_deque))