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

Merge pull request #42557 from justincbeard/bugfix_37312

Browse source 
Fixing output so --force-color and --no-color override master and min…
This commit is contained in:
Mike Place 2017-07-27 12:07:32 -05:00 • committed by GitHub
commit 52605c249d
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: