lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-05-09 21:13:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow running NeoPG binary (instead of GnuPG)

Browse Source
This commit is contained in:
Roman Zeyde
2018-06-30 12:44:17 +03:00
parent f74de828fc
commit f36ef4ffe0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libagent/gpg/keyring.py
View File

@@ -198,16 +198,18 @@ def get_gnupg_components(sp=subprocess):
@util.memoize @util.memoize
def get_gnupg_binary(sp=subprocess): def get_gnupg_binary(sp=subprocess, neopg_binary=None):
"""Starting GnuPG 2.2.x, the default installation uses `gpg`.""" """Starting GnuPG 2.2.x, the default installation uses `gpg`."""
return get_gnupg_components(sp=sp)['gpg'] if neopg_binary:
return [neopg_binary, 'gpg2']
return [get_gnupg_components(sp=sp)['gpg']]
def gpg_command(args, env=None): def gpg_command(args, env=None):
"""Prepare common GPG command line arguments.""" """Prepare common GPG command line arguments."""
if env is None: if env is None:
env = os.environ env = os.environ
cmd = [get_gnupg_binary()] cmd = get_gnupg_binary(neopg_binary=env.get('NEOPG_BINARY'))
homedir = env.get('GNUPGHOME') homedir = env.get('GNUPGHOME')
if homedir: if homedir:
cmd.extend(['--homedir', homedir]) cmd.extend(['--homedir', homedir])