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 #26232 from garethgreenaway/2015_5_gpg_trust_key_fix

Browse source 
Fix to trust_key in gpg module for 2015.5.
This commit is contained in:
Justin Findlay 2015-08-11 22:48:27 -06:00
commit a93b96c9ba
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/modules/gpg.py
View file

@ -24,6 +24,11 @@ import salt.utils
import salt.syspaths
from salt.ext.six import string_types
try:
from shlex import quote as _cmd_quote # pylint: disable=E0611
except ImportError:
from pipes import quote as _cmd_quote
from salt.exceptions import (
SaltInvocationError
)
@ -791,15 +796,15 @@ def trust_key(keyid=None,
if trust_level not in _VALID_TRUST_LEVELS:
return 'ERROR: Valid trust levels - {0}'.format(','.join(_VALID_TRUST_LEVELS))
cmd = 'echo {0}:{1} | {2} --import-ownertrust'.format(fingerprint,
NUM_TRUST_DICT[trust_level],
_check_gpg())
cmd = 'echo {0}:{1} | {2} --import-ownertrust'.format(_cmd_quote(fingerprint),
_cmd_quote(NUM_TRUST_DICT[trust_level]),
_cmd_quote(_check_gpg()))
_user = user
if user == 'salt':
homeDir = os.path.join(salt.syspaths.CONFIG_DIR, 'gpgkeys')
cmd = '{0} --homedir {1}'.format(cmd, homeDir)
_user = 'root'
res = __salt__['cmd.run_all'](cmd, runas=_user)
res = __salt__['cmd.run_all'](cmd, runas=_user, python_shell=True)
if not res['retcode'] == 0:
ret['res'] = False