From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 2 Feb 2016 18:55:34 +0000 (+0000)
Subject: Fix an error handling path that would never have been reached. fixes ticket:2543
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/nxhtml.html?a=commitdiff_plain;h=278ee0db76cd39682a0d0469ad9d6946828ce05f;p=tahoe-lafs%2Ftahoe-lafs.git

Fix an error handling path that would never have been reached. fixes ticket:2543

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/mutable/layout.py b/src/allmydata/mutable/layout.py
index b938794f..40fd9331 100644
--- a/src/allmydata/mutable/layout.py
+++ b/src/allmydata/mutable/layout.py
@@ -1171,7 +1171,7 @@ class MDMFSlotWriteProxy:
             else:
                 if on_success: on_success()
             return results
-        d.addCallback(_result)
+        d.addBoth(_result)
         return d
 
 def _handle_bad_struct(f):