summaryrefslogtreecommitdiff
path: root/src/leap/services/soledad
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-29 15:20:32 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-29 15:20:32 -0300
commit1f3573503be0cf7d61fa80ea866b8bef4a57b111 (patch)
treeab93803d57673f3dce633472baf20dc353c00a44 /src/leap/services/soledad
parent7780685a8beb8fbba54d5c366905d9ece5569008 (diff)
parent884d0e0f4dbba34b6f6f5afe6e27390a7606a7fa (diff)
Merge remote-tracking branch 'kali/feature/ci-ready' into develop
Diffstat (limited to 'src/leap/services/soledad')
-rw-r--r--src/leap/services/soledad/soledadbootstrapper.py8
-rw-r--r--src/leap/services/soledad/soledadconfig.py1
2 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py
index bae933de..db019a87 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/services/soledad/soledadbootstrapper.py
@@ -218,7 +218,8 @@ class SoledadBootstrapper(QtCore.QObject):
self._keymanager.get_key(address, openpgp.OpenPGPKey,
private=True, fetch_remote=False)
except KeyNotFound:
- logger.debug("Key not found. Generating key for %s" % (address,))
+ logger.debug(
+ "Key not found. Generating key for %s" % (address,))
self._keymanager.gen_key(openpgp.OpenPGPKey)
logger.debug("Key generated successfully.")
@@ -235,8 +236,9 @@ class SoledadBootstrapper(QtCore.QObject):
logger.debug("Uploading public key to %s" % (key_uri,))
- pubkey = self._keymanager.get_key(address, openpgp.OpenPGPKey,
- private=False, fetch_remote=False)
+ pubkey = self._keymanager.get_key(
+ address, openpgp.OpenPGPKey,
+ private=False, fetch_remote=False)
key_data = {
self.PUBKEY_KEY: pubkey.key_data,
}
diff --git a/src/leap/services/soledad/soledadconfig.py b/src/leap/services/soledad/soledadconfig.py
index 836265f3..80a82d11 100644
--- a/src/leap/services/soledad/soledadconfig.py
+++ b/src/leap/services/soledad/soledadconfig.py
@@ -45,4 +45,3 @@ class SoledadConfig(BaseConfig):
def get_locations(self):
return self._safe_get_value("locations")
-