saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #50972 from pirogoeth/sjohn/2018.3-apt-key-batch

Browse source 
Use gpg's --batch in apt-key adv during repo key add
This commit is contained in:
Gareth J. Greenaway 2019-01-02 18:34:12 -08:00 • committed by GitHub
commit 4685e0ef5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/aptpkg.py
View file

@ -1945,7 +1945,7 @@ def get_repo_keys():
# The double usage of '--with-fingerprint' is necessary in order to
# retrieve the fingerprint of the subkey.
cmd = ['apt-key', 'adv', '--list-public-keys', '--with-fingerprint',
cmd = ['apt-key', 'adv', '--batch', '--list-public-keys', '--with-fingerprint',
'--with-fingerprint', '--with-colons', '--fixed-list-mode']
cmd_ret = __salt__['cmd.run_all'](cmd=cmd)
@ -2045,7 +2045,7 @@ def add_repo_key(path=None, text=None, keyserver=None, keyid=None, saltenv='base
error_msg = 'No keyid or keyid too short for keyserver: {0}'.format(keyserver)
raise SaltInvocationError(error_msg)
cmd.extend(['adv', '--keyserver', keyserver, '--recv', keyid])
cmd.extend(['adv', '--batch', '--keyserver', keyserver, '--recv', keyid])
elif keyid:
error_msg = 'No keyserver specified for keyid: {0}'.format(keyid)
raise SaltInvocationError(error_msg)
@ -2342,10 +2342,10 @@ def mod_repo(repo, saltenv='base', **kwargs):
if not imported:
http_proxy_url = _get_http_proxy_url()
if http_proxy_url:
cmd = ['apt-key', 'adv', '--keyserver-options', 'http-proxy={0}'.format(http_proxy_url),
cmd = ['apt-key', 'adv', '--batch', '--keyserver-options', 'http-proxy={0}'.format(http_proxy_url),
'--keyserver', keyserver, '--logger-fd', '1', '--recv-keys', keyid]
else:
cmd = ['apt-key', 'adv', '--keyserver', keyserver,
cmd = ['apt-key', 'adv', '--batch', '--keyserver', keyserver,
'--logger-fd', '1', '--recv-keys', keyid]
ret = __salt__['cmd.run_all'](cmd,
python_shell=False,