Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_log_contexts

This commit is contained in:
Erik Johnston 2016-08-24 13:22:02 +01:00
parent 9219139351 3e86dcf1c0
commit fda97dd58a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/federation.py
View File

@ -375,9 +375,9 @@ class FederationHandler(BaseHandler):
], ],
consumeErrors=True consumeErrors=True
)).addErrback(unwrapFirstError) )).addErrback(unwrapFirstError)
auth_events.update({a.event_id: a for a in results}) auth_events.update({a.event_id: a for a in results if a})
required_auth.update( required_auth.update(
a_id for event in results for a_id, _ in event.auth_events a_id for event in results for a_id, _ in event.auth_events if event
) )
missing_auth = required_auth - set(auth_events) missing_auth = required_auth - set(auth_events)