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 #42173 from rallytime/bp-37424

Browse source 
Back-port #37424 to 2016.11
This commit is contained in:
Nicole Thomas 2017-07-07 10:39:59 -06:00 • committed by GitHub
commit 89261cf06c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/gpg.py
View file

@ -132,7 +132,7 @@ def present(name,
else:
ret['comment'].append('Invalid trust level {0}'.format(trust))
ret['comment'] = '\n'.join(ret['comment'])
ret['comment'] = '\n'.join(ret['comment'])
return ret
@ -188,5 +188,5 @@ def absent(name,
ret['comment'].append('Deleting {0} from GPG keychain'.format(name))
else:
ret['comment'].append('{0} not found in GPG keychain'.format(name))
ret['comment'] = '\n'.join(ret['comment'])
ret['comment'] = '\n'.join(ret['comment'])
return ret