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

decode highstate error messages to utf-8

Browse source 
Fixes #28476.
This commit is contained in:
Justin Findlay 2015-11-03 11:30:30 -07:00
parent c6a6fe0089
commit 9c9bb75c37
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/output/highstate.py
View file

@ -71,6 +71,7 @@ import textwrap
import salt.utils
import salt.utils.locales
import salt.output
from salt.utils.locales import sdecode
# Import 3rd-party libs
import salt.ext.six as six
@ -111,7 +112,7 @@ def _format_host(host, data):
.format(hcolor, colors)))
for err in data:
if strip_colors:
err = salt.output.strip_esc_sequence(err)
err = salt.output.strip_esc_sequence(sdecode(err))
hstrs.append((u'{0}----------\n {1}{2[ENDC]}'
.format(hcolor, err, colors)))
if isinstance(data, dict):