diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-13 15:44:19 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-13 15:44:19 -0400 |
| commit | 4649be42ce28aac037ee91a67995e6e1d982240b (patch) | |
| tree | 30b73f4bdac8ef631e3582527b89223e09d16001 /src/leap/keymanager/gpg.py | |
| parent | c2b5526b020967ff4cf7c5fd08d0d8483363095e (diff) | |
| parent | 3d3062e0463960e9ca1d5d7bb75e768ca876aafd (diff) | |
Merge tag '0.3.0' into debian
Tag keymanager version 0.3.0
Diffstat (limited to 'src/leap/keymanager/gpg.py')
| -rw-r--r-- | src/leap/keymanager/gpg.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/keymanager/gpg.py b/src/leap/keymanager/gpg.py index 15c1d9f..b81b218 100644 --- a/src/leap/keymanager/gpg.py +++ b/src/leap/keymanager/gpg.py @@ -110,9 +110,10 @@ class GPGWrapper(gnupg.GPG): @raise: RuntimeError with explanation message if there is a problem invoking gpg. """ + # XXX: options isn't always supported, so removing for the time being gnupg.GPG.__init__(self, gnupghome=gnupghome, gpgbinary=gpgbinary, verbose=verbose, use_agent=use_agent, - keyring=keyring, options=options) + keyring=keyring)#, options=options) self.result_map['list-packets'] = ListPackets def find_key_by_email(self, email, secret=False): |