summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/keymanager/openpgp.py
diff options
context:
space:
mode:
authorNavaL <ayoyo@thoughtworks.com>2016-11-24 11:57:08 +0100
committerRuben Pollan <meskio@sindominio.net>2017-12-03 20:43:30 +0100
commit95f8a39c2185d9cc3af4e6ed600aea98c13d1949 (patch)
tree56f32930c381ded6326c9f78d839fad4b6be56c0 /src/leap/bitmask/keymanager/openpgp.py
parent0454dc3545693a8c6325f4864d89154c514b3bcb (diff)
[feat] supplying gpgbinary when building gpg key from dict
Diffstat (limited to 'src/leap/bitmask/keymanager/openpgp.py')
-rw-r--r--src/leap/bitmask/keymanager/openpgp.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/leap/bitmask/keymanager/openpgp.py b/src/leap/bitmask/keymanager/openpgp.py
index 593536eb..d82f8e52 100644
--- a/src/leap/bitmask/keymanager/openpgp.py
+++ b/src/leap/bitmask/keymanager/openpgp.py
@@ -332,10 +332,13 @@ class OpenPGPScheme(object):
else:
key = yield self._repair_key_docs(fp_keys)
key.content[HAS_ACTIVE] = True
- keys.append(build_key_from_dict(key.content, active.content))
+ keys.append(build_key_from_dict(key.content, active.content,
+ gpgbinary=self._gpgbinary))
unactive_keys = filter(lambda k: HAS_ACTIVE not in k.content, key_docs)
- keys += map(lambda k: build_key_from_dict(k.content), unactive_keys)
+ keys += map(lambda k: build_key_from_dict(k.content,
+ gpgbinary=self._gpgbinary),
+ unactive_keys)
defer.returnValue(keys)
def parse_key(self, key_data, address=None):