summaryrefslogtreecommitdiff
path: root/keymanager/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-08 21:47:35 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-08 21:47:35 -0300
commit1195bcdb087c4b701e040b87e16813b2e68aa14e (patch)
treee4c03c035a1042d9185fdc92fc64c262384c66a9 /keymanager/src
parent0195968571222d6852eb03a5dec312b5a208f4d6 (diff)
parent3e9aa2257a292bd7ce26896dd824c57d640058e4 (diff)
Merge remote-tracking branch 'drebs/bug/3397-keymanager-should-support-bundled-gpg' into develop
Diffstat (limited to 'keymanager/src')
-rw-r--r--keymanager/src/leap/keymanager/openpgp.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/keymanager/src/leap/keymanager/openpgp.py b/keymanager/src/leap/keymanager/openpgp.py
index 1e78c70..aa04ed0 100644
--- a/keymanager/src/leap/keymanager/openpgp.py
+++ b/keymanager/src/leap/keymanager/openpgp.py
@@ -433,9 +433,7 @@ class OpenPGPScheme(EncryptionScheme):
logger.debug("%s" % (stderr,))
if getattr(result, 'ok', None) is not True:
raise errors.EncryptionDecryptionFailed(
- 'Failed to encrypt/decrypt in %s: %s' % (
- this.encrypt,
- stderr))
+ 'Failed to encrypt/decrypt: %s' % stderr)
def encrypt(self, data, pubkey, passphrase=None, sign=None):
"""