summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-12 09:29:49 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-12 09:29:49 -0300
commitfb3fb9ffb0e0902bb22e3635cbeb3da4585edcd5 (patch)
tree00bb9f49e5bfdaefa5c18544d2539b991cb04b2d /src/leap
parent435100feb7d373701fbbac41013b06f46ddb914d (diff)
parent02a72c675107f9d324184265e414600c69763d7a (diff)
Merge remote-tracking branch 'drebs/bug/4364_send-key-whenever-keymanager-inits' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 54ef67eb..ce8bf813 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -367,6 +367,8 @@ class SoledadBootstrapper(AbstractBootstrapper):
api_version=self._provider_config.get_api_version(),
uid=srp_auth.get_uid(),
gpgbinary=self._get_gpg_bin_path())
+ # make sure key is in server
+ self._keymanager.send_key(openpgp.OpenPGPKey)
def _gen_key(self, _):
"""
@@ -393,7 +395,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
try:
self._keymanager.gen_key(openpgp.OpenPGPKey)
except Exception as exc:
- logger.error("error while generating key!")
+ logger.error("Error while generating key!")
logger.exception(exc)
raise
@@ -401,7 +403,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
try:
self._keymanager.send_key(openpgp.OpenPGPKey)
except Exception as exc:
- logger.error("error while sending key!")
+ logger.error("Error while sending key!")
logger.exception(exc)
raise