diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-08 21:47:35 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-08 21:47:35 -0300 |
| commit | 9a6132066df109f5c90cc6ca3316b973fa26b747 (patch) | |
| tree | 6fb450b0a9e34352c7ba58c66a7ad3a79a9e825e /src/leap/keymanager | |
| parent | 34c7971cfdfcd8c56903a17155da30a374d55d5d (diff) | |
| parent | 9a76c5df05d257693bb1e9e36da1961bc17ef025 (diff) | |
Merge remote-tracking branch 'drebs/bug/3397-keymanager-should-support-bundled-gpg' into develop
Diffstat (limited to 'src/leap/keymanager')
| -rw-r--r-- | src/leap/keymanager/openpgp.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py index 1e78c70..aa04ed0 100644 --- a/src/leap/keymanager/openpgp.py +++ b/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): """ |