summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-12-14 05:10:31 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2018-12-14 05:13:33 +1100
commitc7144b105ca0a14ccad6abd1f1f686253a5ee5bc (patch)
tree209ac81bdbb53328774897ce4b9bee4879db1a61
parent0.34.0rc2 (diff)
downloadsynapse-c7144b105ca0a14ccad6abd1f1f686253a5ee5bc.tar.xz
Settings Fix deleting e2e room keys on xenial (#4295)
-rw-r--r--changelog.d/4295.bugfix1
-rw-r--r--synapse/storage/e2e_room_keys.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4295.bugfix b/changelog.d/4295.bugfix
new file mode 100644
index 0000000000..e1603cbcda
--- /dev/null
+++ b/changelog.d/4295.bugfix
@@ -0,0 +1 @@
+Fix deleting E2E room keys when using old SQLite versions.
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 16b7f005aa..45cebe61d1 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -182,7 +182,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
 
         keyvalues = {
             "user_id": user_id,
-            "version": version,
+            "version": int(version),
         }
         if room_id:
             keyvalues['room_id'] = room_id