summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-08-08 23:48:23 +0200
committerdrebs <drebs@leap.se>2013-08-08 23:48:23 +0200
commit34c7971cfdfcd8c56903a17155da30a374d55d5d (patch)
tree59ebb4d9585042d324b9984c85d2b9122b3798d6 /src
parent8a66bf5912e1090ca90ca2b4e8cc1ef129e8ac79 (diff)
parent18620efca24a438f28f8aaaec2f1a292f5390c4b (diff)
Merge branch 'bug/unsupported_options' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/keymanager/gpg.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/keymanager/gpg.py b/src/leap/keymanager/gpg.py
index 15c1d9f6..b81b218f 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):