Commit 4cad7462 authored by Philipp Hörist's avatar Philipp Hörist

[pgp] Fix key migration

parent 0d99f3a2
......@@ -50,9 +50,10 @@ class KeyStore:
def _migrate(self):
keys = {}
attached_keys = app.config.get_per(
'accounts', self._account, 'attached_gpg_keys').split()
if attached_keys is None:
'accounts', self._account, 'attached_gpg_keys')
if not attached_keys:
return
attached_keys = attached_keys.split()
for i in range(len(attached_keys) // 2):
keys[attached_keys[2 * i]] = attached_keys[2 * i + 1]
......@@ -64,6 +65,9 @@ class KeyStore:
own_key_user = app.config.get_per('accounts', self._account, 'keyname')
if own_key_id:
self.set_own_key_data((own_key_id, own_key_user))
attached_keys = app.config.set_per(
'accounts', self._account, 'attached_gpg_keys', '')
self._log.info('Migration successful')
@delay_execution(500)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment