diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-12-21 11:01:56 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-12-21 11:01:56 +0000 |
| commit | 42a7a09eead6ad54ab91f7616a9b2bd7c5749187 (patch) | |
| tree | b662216569581796de50fb4a4f309e0bee3242ce /synapse/crypto/keyring.py | |
| parent | Merge pull request #451 from matrix-org/markjh/branch_coverage (diff) | |
| parent | Actually look up required remote server key IDs (diff) | |
| download | synapse-42a7a09eead6ad54ab91f7616a9b2bd7c5749187.tar.xz | |
Merge pull request #452 from matrix-org/paul/SYN-558
Actually look up required remote server key IDs
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()) |