diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-16 15:59:40 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-16 15:59:40 +0000 |
| commit | 23da4a40510bfda5c617946cf6f2b7ab3f95b480 (patch) | |
| tree | 238b444ceffc72af13014f627d87b7140a11f47f /synapse | |
| parent | Fix upgrade script to run all the missing deltas. (diff) | |
| download | synapse-23da4a40510bfda5c617946cf6f2b7ab3f95b480.tar.xz | |
Fix typo where we thought a list was a dict
Diffstat (limited to '')
| -rw-r--r-- | synapse/state.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py index 38adde4dc9..99f873b6e5 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -263,9 +263,10 @@ class StateHandler(object): } if event_type: - prev_states = conflicted_state.get( - (event_type, state_key), {} - ).keys() + prev_states_events = conflicted_state.get( + (event_type, state_key), [] + ) + prev_states = [s.event_id for s in prev_states_events] else: prev_states = [] |