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

Fixing output so --force-color and --no-color override master and minion config color value

Browse Source
This commit is contained in:
J. Beard 2017-07-23 21:02:13 -07:00
parent 07c2793e86
commit ee3bc6eb10
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/output/__init__.py
View File

@ -168,6 +168,13 @@ def get_printout(out, opts=None, **kwargs):
opts['color'] = False
else:
opts['color'] = True
else:
if opts.get('force_color', False):
opts['color'] = True
elif opts.get('no_color', False) or salt.utils.is_windows():
opts['color'] = False
else:
pass
outputters = salt.loader.outputters(opts)
if out not in outputters: