diff options
| author | David Baker <dave@matrix.org> | 2015-12-21 15:30:26 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-12-21 15:30:26 +0000 |
| commit | c061b47c575927b4d93b397b1f88233b8205baab (patch) | |
| tree | a82fd06b08a9e7c268b5bbad9a6d8a718a9c9c14 /synapse/crypto/keyring.py | |
| parent | Only run pushers for users on this hs! (diff) | |
| parent | Remove accidentally committed debug logging (diff) | |
| download | synapse-c061b47c575927b4d93b397b1f88233b8205baab.tar.xz | |
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index bc5bb5cdb1..1fea568eed 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -230,7 +230,9 @@ class Keyring(object): missing_keys = {} for group in group_id_to_group.values(): - missing_keys.setdefault(group.server_name, set()).union(group.key_ids) + missing_keys.setdefault(group.server_name, set()).update( + group.key_ids + ) for fn in key_fetch_fns: results = yield fn(missing_keys.items()) |