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

fix translation of the test output system

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-24 23:08:57 -06:00
parent 1fa5129b90
commit 87d155e944
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/output/__init__.py
View File

@ -9,7 +9,7 @@ import salt.loader
STATIC = ( STATIC = (
'yaml_out', 'yaml_out',
'txt_out', 'text_out',
'raw_out', 'raw_out',
'json_out', 'json_out',
) )
@ -28,7 +28,10 @@ def get_printout(out, opts=None, **kwargs):
for outputter in STATIC: for outputter in STATIC:
if outputter in opts: if outputter in opts:
if opts[outputter]: if opts[outputter]:
out = outputter if outputter == 'text_out':
out = 'txt'
else:
out = outputter
if out is None: if out is None:
out = 'pprint' out = 'pprint'
if out.endswith('_out'): if out.endswith('_out'):