diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-16 17:29:49 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-16 17:29:49 +0000 |
| commit | 56db465047c2906a78eccdd63b2fa18d72903a66 (patch) | |
| tree | bdd082c04fd0c02b4d732bf8ea6e4dd559d84b51 /synapse/state.py | |
| parent | SYN-142: Use a default log file 'homeserver.log' so people get logging by def... (diff) | |
| parent | Change upgrade script to not check hashes or signatures (diff) | |
| download | synapse-56db465047c2906a78eccdd63b2fa18d72903a66.tar.xz | |
Merge branch 'release-v0.6.0' into develop
Diffstat (limited to 'synapse/state.py')
| -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 551058b510..15397e2f38 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -203,9 +203,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 = [] |