summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-26 09:48:13 +0100
committerErik Johnston <erik@matrix.org>2016-08-26 09:48:13 +0100
commit30961182f2c7ecc596cdbe2cc06a861d0f8a2f7b (patch)
treee689fff70ffc280319bb15056c41ae0bc595c572 /synapse/handlers/federation.py
parentMake sync not pull out full state (diff)
parentMerge pull request #1043 from matrix-org/erikj/backfill_fix (diff)
downloadsynapse-30961182f2c7ecc596cdbe2cc06a861d0f8a2f7b.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 2b88e6550e..a6642ff232 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -387,7 +387,9 @@ class FederationHandler(BaseHandler):
                 )).addErrback(unwrapFirstError)
                 auth_events.update({a.event_id: a for a in results if a})
                 required_auth.update(
-                    a_id for event in results for a_id, _ in event.auth_events if event
+                    a_id
+                    for event in results if event
+                    for a_id, _ in event.auth_events
                 )
                 missing_auth = required_auth - set(auth_events)