From c95fe65177519e20348d1156f6c7925ce88cad3a Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Mon, 12 Jun 2017 21:32:35 +0200 Subject: [bug] fix keymanager issues with last merge --- src/leap/bitmask/keymanager/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/leap/bitmask/keymanager') diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py index 68184175..5a76761a 100644 --- a/src/leap/bitmask/keymanager/__init__.py +++ b/src/leap/bitmask/keymanager/__init__.py @@ -215,7 +215,7 @@ class KeyManager(object): validation_level = ValidationLevels.Provider_Trust yield self.put_raw_key( - server_keys[OPENPGP_KEY], + server_keys[self.OPENPGP_KEY], address=address, validation=validation_level) @@ -636,7 +636,7 @@ class KeyManager(object): existing = yield self.get_key(address, fetch_remote=False) except KeyNotFound: existing = None - if (existing is not None or + if (existing is None or pubkey.fingerprint != existing.fingerprint): raise keymanager_errors.KeyNotValidUpgrade( "Cannot update your %s key without the private part" -- cgit v1.2.3