From: Daira Hopwood Date: Mon, 18 May 2015 23:38:28 +0000 (+0100) Subject: More fixes. X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/provisioning?a=commitdiff_plain;h=befd3cf2a562e504c55929e0c849464484546f20;p=tahoe-lafs%2Ftahoe-lafs.git More fixes. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py index 4dc59798..3f2c7aad 100644 --- a/src/allmydata/frontends/drop_upload.py +++ b/src/allmydata/frontends/drop_upload.py @@ -202,7 +202,7 @@ class DropUploader(service.MultiService): def _failed(f): self._log("failed to create subdirectory %r due to %r" % (path, f)) self._stats_provider.count('drop_upload.objects_failed', 1) - d2.addCallback(_failed) + d2.addErrback(_failed) d2.addCallback(lambda ign: self._scan(path)) return d2 diff --git a/src/allmydata/windows/inotify.py b/src/allmydata/windows/inotify.py index 87e05b66..887c6384 100644 --- a/src/allmydata/windows/inotify.py +++ b/src/allmydata/windows/inotify.py @@ -280,7 +280,6 @@ class FileNotifier(object): log.err(e) else: s = Notification(self._read_dword(data, pos+4), path_u) - print s yield s next_entry_offset = self._read_dword(data, pos) @@ -382,13 +381,13 @@ class INotify(PollMixin): # . while True: - # We must set _started to True *after* calling read_notifications, so that + # We must callback self._started_d *after* calling read_notifications, so that # the caller of startReading() can tell when we've actually started reading. self._notifier.read_notifications() if not started: - reactor.callFromThread(self._started_d.callback, None) started = True + reactor.callFromThread(self._started_d.callback, None) for info in self._notifier.get_notifications(): print info