Merge branch 'fix/96-no-use-agent' into develop
commit
5d03c3c5eb
|
@ -537,8 +537,8 @@ class GPGBase(object):
|
||||||
|
|
||||||
if passphrase: cmd.append('--batch --passphrase-fd 0')
|
if passphrase: cmd.append('--batch --passphrase-fd 0')
|
||||||
|
|
||||||
if self.use_agent: cmd.append('--use-agent')
|
if self.use_agent is True: cmd.append('--use-agent')
|
||||||
else: cmd.append('--no-use-agent')
|
elif self.use_agent is False: cmd.append('--no-use-agent')
|
||||||
|
|
||||||
# The arguments for debugging and verbosity should be placed into the
|
# The arguments for debugging and verbosity should be placed into the
|
||||||
# cmd list before the options/args in order to resolve Issue #76:
|
# cmd list before the options/args in order to resolve Issue #76:
|
||||||
|
|
|
@ -161,6 +161,12 @@ class GPG(GPGBase):
|
||||||
# fatal error (at least it does with GnuPG>=2.0.0):
|
# fatal error (at least it does with GnuPG>=2.0.0):
|
||||||
self.create_trustdb()
|
self.create_trustdb()
|
||||||
|
|
||||||
|
# The --no-use-agent and --use-agent options were deprecated in GnuPG
|
||||||
|
# 2.x, so we should set use_agent to None here to avoid having
|
||||||
|
# GPGBase._make_args() add either one.
|
||||||
|
if self.is_gpg2():
|
||||||
|
self.use_agent = None
|
||||||
|
|
||||||
@functools.wraps(_trust._create_trustdb)
|
@functools.wraps(_trust._create_trustdb)
|
||||||
def create_trustdb(self):
|
def create_trustdb(self):
|
||||||
if self.is_gpg2():
|
if self.is_gpg2():
|
||||||
|
|
Loading…
Reference in New Issue