Unsignedio
/
python-gnupg
mirror of https://github.com/markqvist/python-gnupg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

special case verbose=True to avoid passing invalid options to gpg --debug-level

fix/24-enc-to-file
Garrett Robinson 2013-09-07 13:25:09 -07:00
parent abf981a1ca
commit faeef9c25a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnupg/_meta.py
View File

@ -140,6 +140,12 @@ class GPGBase(object):
log.error("GPGBase.__init__(): %s" % ae.message) log.error("GPGBase.__init__(): %s" % ae.message)
raise RuntimeError(ae.message) raise RuntimeError(ae.message)
else: else:
if verbose is True:
# The caller wants logging, but we need a valid --debug-level
# for gpg. Default to "basic", and warn about the ambiguity.
# (garrettr)
verbose = "basic"
log.warning('GPG(verbose=True) is ambiguous, defaulting to "basic" logging')
self.verbose = verbose self.verbose = verbose
self.use_agent = use_agent self.use_agent = use_agent

7
gnupg/gnupg.py
View File

@ -76,6 +76,13 @@ class GPG(GPGBase):
and private keyrings. Default is whatever GnuPG and private keyrings. Default is whatever GnuPG
defaults to. defaults to.
:param str,int,bool verbose: String or numeric value to pass to gpg's
``--debug-level`` option. See the gpg man
page for the list of valid options. If
False, debug output is not generated by
the gpg binary. If True, defaults to
``--debug-level basic.``
:param str keyring: Name of keyring file containing public key data, if :param str keyring: Name of keyring file containing public key data, if
unspecified, defaults to 'pubring.gpg' in the unspecified, defaults to 'pubring.gpg' in the
``homedir`` directory. ``homedir`` directory.