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

output.key: decode minion ids to unicode

Browse source
This commit is contained in:
Justin Findlay 2016-01-27 09:40:32 -07:00
parent 7a16f1c941
commit 8f6737b6c4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/output/key.py
View file

@ -10,6 +10,7 @@ from __future__ import absolute_import
# Import salt libs
import salt.utils
import salt.output
from salt.utils.locales import sdecode
def output(data):
@ -88,9 +89,8 @@ def output(data):
for status in sorted(data):
ret += u'{0}\n'.format(trans[status])
for key in sorted(data[status]):
skey = key
if strip_colors:
skey = salt.output.strip_esc_sequence(key)
key = sdecode(key)
skey = salt.output.strip_esc_sequence(key) if strip_colors else key
if isinstance(data[status], list):
ret += u'{0}{1}{2}{3}\n'.format(
' ' * ident,