Merge pull request #2048 from matrix-org/rav/missing_yield

Add a missing yield in device key upload
This commit is contained in:
Richard van der Hoff 2017-03-23 09:29:44 +00:00 committed by GitHub
commit 55366814a6

View File

@ -316,7 +316,7 @@ class E2eKeysHandler(object):
# old access_token without an associated device_id. Either way, we # old access_token without an associated device_id. Either way, we
# need to double-check the device is registered to avoid ending up with # need to double-check the device is registered to avoid ending up with
# keys without a corresponding device. # keys without a corresponding device.
self.device_handler.check_device_registered(user_id, device_id) yield self.device_handler.check_device_registered(user_id, device_id)
result = yield self.store.count_e2e_one_time_keys(user_id, device_id) result = yield self.store.count_e2e_one_time_keys(user_id, device_id)