summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-20 14:55:31 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-20 14:55:31 +0000
commitbcbc56fe2194e6ee8677c7a871ae0e2718db91b5 (patch)
tree77b608d3496ea0b2c800526f59a3678b949cbdb1 /synapse/handlers/federation.py
parentExplode on duplicate delta file names. (#6565) (diff)
parentFix exceptions when attempting to backfill (#6576) (diff)
downloadsynapse-bcbc56fe2194e6ee8677c7a871ae0e2718db91b5.tar.xz
Fix exceptions when attempting to backfill (#6576)
* commit '03d3792f3':
  Fix exceptions when attempting to backfill (#6576)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index c6346c680b..0fc62c1063 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -789,7 +789,10 @@ class FederationHandler(BaseHandler):
         events_to_state = {}
         for e_id in edges:
             state, auth = await self._get_state_for_room(
-                destination=dest, room_id=room_id, event_id=e_id
+                destination=dest,
+                room_id=room_id,
+                event_id=e_id,
+                include_event_in_state=False,
             )
             auth_events.update({a.event_id: a for a in auth})
             auth_events.update({s.event_id: s for s in state})