Remove options from the constructor call for gnupg.GPG

diff --git a/changes/bug_supported_options b/changes/bug_supported_options
new file mode 100644 (file)
index 0000000..e7a70d3
--- /dev/null
+++ b/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/src/leap/keymanager/gpg.py b/src/leap/keymanager/gpg.py
index 15c1d9f..b81b218 100644 (file)
--- 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.
         """
         @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,
         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):
         self.result_map['list-packets'] = ListPackets
 
     def find_key_by_email(self, email, secret=False):