summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-20 11:33:29 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-20 11:33:29 +0000
commit1a6d5bfa08b4ba618dcab68e4ed524c4db07da2b (patch)
treec29f79003b2ff7bd8a26d5dcbdf44a1f96a71fed /synapse
parentimport from package-debian-synapse (diff)
downloadsynapse-1a6d5bfa08b4ba618dcab68e4ed524c4db07da2b.tar.xz
Debian packaging via dh_virtualenv (#4285)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/python_dependencies.py2
-rw-r--r--synapse/storage/e2e_room_keys.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 92422c6ffc..96cd154234 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -78,7 +78,7 @@ CONDITIONAL_REQUIREMENTS = {
     },
     "postgres": {
         "psycopg2>=2.6": ["psycopg2"]
-    }
+    },
 }
 
 
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