summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-06-12 21:32:35 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-06-13 13:54:52 +0200
commitc95fe65177519e20348d1156f6c7925ce88cad3a (patch)
tree31bf58b0764d326830fa221f87f83c801bb1ec54 /src
parent724191972ba44ce1ae5f7904bf21ec37f38aa384 (diff)
[bug] fix keymanager issues with last merge
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/keymanager/__init__.py4
1 files changed, 2 insertions, 2 deletions
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"