summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-08 11:36:00 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-08 11:36:00 -0300
commit66e7044bef038b5bf07fa4d6bddd50edc80e6c4b (patch)
tree21ded1ea46a50f7c5da8ba49f4c6ac2946aef48c
parent52178f62cc880c19593a4fe15efbff812ad0b47d (diff)
Remove options from the constructor call for gnupg.GPG
-rw-r--r--keymanager/changes/bug_supported_options2
-rw-r--r--keymanager/src/leap/keymanager/gpg.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/keymanager/changes/bug_supported_options b/keymanager/changes/bug_supported_options
new file mode 100644
index 0000000..e7a70d3
--- /dev/null
+++ b/keymanager/changes/bug_supported_options
@@ -0,0 +1,2 @@
+ o Options parameter in gnupg.GPG isn't supported by all versions, so
+ removing it for the time being. \ No newline at end of file
diff --git a/keymanager/src/leap/keymanager/gpg.py b/keymanager/src/leap/keymanager/gpg.py
index 15c1d9f..b81b218 100644
--- a/keymanager/src/leap/keymanager/gpg.py
+++ b/keymanager/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):