From 3329c29cb4279dc00d92ed345382309c0dc47083 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 30 Jun 2018 12:50:55 +0300 Subject: [PATCH] Use gpg_command() for identity generation --- libagent/gpg/__init__.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py index 6cb894a..5730d44 100644 --- a/libagent/gpg/__init__.py +++ b/libagent/gpg/__init__.py @@ -178,21 +178,22 @@ fi # Generate new GPG identity and import into GPG keyring pubkey = write_file(os.path.join(homedir, 'pubkey.asc'), export_public_key(device_type, args)) - gpg_binary = keyring.get_gnupg_binary() - check_call([gpg_binary, '--homedir', homedir, '--quiet', - '--import', pubkey.name]) + check_call(keyring.gpg_command(['--homedir', homedir, '--quiet', + '--import', pubkey.name])) # Make new GPG identity with "ultimate" trust (via its fingerprint) - out = check_output([gpg_binary, '--homedir', homedir, '--list-public-keys', - '--with-fingerprint', '--with-colons']) + out = check_output(keyring.gpg_command(['--homedir', homedir, + '--list-public-keys', + '--with-fingerprint', + '--with-colons'])) fpr = re.findall('fpr:::::::::([0-9A-F]+):', out)[0] f = write_file(os.path.join(homedir, 'ownertrust.txt'), fpr + ':6\n') - check_call([gpg_binary, '--homedir', homedir, - '--import-ownertrust', f.name]) + check_call(keyring.gpg_command(['--homedir', homedir, + '--import-ownertrust', f.name])) # Load agent and make sure it responds with the new identity - check_call([gpg_binary, '--list-secret-keys', args.user_id], - env={'GNUPGHOME': homedir}) + check_call(keyring.gpg_command(['--list-secret-keys', args.user_id, + '--homedir', homedir])) def run_unlock(device_type, args):