valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression in salt-ssh caused by yaml utf8 check

Browse Source
This commit is contained in:
Thomas S Hatch 2013-12-26 14:02:23 -07:00
parent 76d027e6b0
commit b31f42d5d8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/renderers/yaml.py
View File

@ -57,9 +57,10 @@ def render(yaml_data, saltenv='base', sls='', argline='', **kws):
if not data:
data = {}
else:
if 'config.get' in __salt__:
if __salt__['config.get']('yaml_utf8', False):
data = _yaml_result_unicode_to_utf8(data)
if isinstance(__salt__, dict):
if 'config.get' in __salt__:
if __salt__['config.get']('yaml_utf8', False):
data = _yaml_result_unicode_to_utf8(data)
log.debug('Results of YAML rendering: \n{0}'.format(data))
return data