From 307e858b942264ce2aa32c592c0dd0fde098ddcd Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 24 Jun 2015 13:11:58 +0100
Subject: [PATCH] Fix backfill

---
 synapse/federation/federation_client.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 47d71542e4..7de7bc89db 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -166,7 +166,10 @@ class FederationClient(FederationBase):
         ]
 
         # FIXME: We should handle signature failures more gracefully.
-        pdus[:] = yield self._check_sigs_and_hashes(pdus)
+        pdus[:] = yield defer.gatherResults(
+            self._check_sigs_and_hashes(pdus),
+            consumeErrors=True,
+        ).addErrback(unwrapFirstError)
 
         defer.returnValue(pdus)