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

Fix trust key 2015.8 (#36540)

Browse source 
* Fix gpg.trust_key user bug

* Separated user and no user case
This commit is contained in:
elainearbaugh 2016-09-27 09:28:28 -07:00 • committed by Nicole Thomas
parent 57ec792f6b
commit 6e36191fc4
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/gpg.py
View file

@ -811,7 +811,10 @@ def trust_key(keyid=None,
if not fingerprint:
if keyid:
key = get_key(keyid)
if user:
key = get_key(keyid, user=user)
else:
key = get_key(keyid)
if key:
if 'fingerprint' not in key:
ret['res'] = False