diff options
| author | drebs <drebs@leap.se> | 2013-08-08 23:48:23 +0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-08-08 23:48:23 +0200 |
| commit | 0195968571222d6852eb03a5dec312b5a208f4d6 (patch) | |
| tree | f3ea7ee3f53589d77d015ca1f6b56f364efc970b /keymanager | |
| parent | cc2cda450925721614eec467e5f8dd6849a50dd8 (diff) | |
| parent | 66e7044bef038b5bf07fa4d6bddd50edc80e6c4b (diff) | |
Merge branch 'bug/unsupported_options' into develop
Diffstat (limited to 'keymanager')
| -rw-r--r-- | keymanager/changes/bug_supported_options | 2 | ||||
| -rw-r--r-- | keymanager/src/leap/keymanager/gpg.py | 3 |
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 00000000..e7a70d38 --- /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 15c1d9f6..b81b218f 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): |