diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-11 17:10:48 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-11 17:10:48 -0700 |
| commit | 9774c363c9ce11202f9170bf38028c812527ea76 (patch) | |
| tree | bb092a52efbd07d1166c635c1dfffc61db5479b9 /lib/puppet | |
| parent | 768a063099c8c855488728da77e8dd165816fa83 (diff) | |
| parent | d7d384ec0b7f28a8f0be20defcc2eebd0550aff0 (diff) | |
Merge branch 'ticket/master/8356-default-color-should-be-false-on-windows'
* ticket/master/8356-default-color-should-be-false-on-windows:
(#8356) Color defaults to false on Windows
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 07442d0e9..488b991d7 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -47,7 +47,7 @@ module Puppet exits. Comma-separate multiple values. For a list of all values, specify 'all'. This feature is only available in Puppet versions higher than 0.18.4."], - :color => ["ansi", "Whether to use colors when logging to the console. + :color => [(Puppet.features.microsoft_windows? ? "false" : "ansi"), "Whether to use colors when logging to the console. Valid values are `ansi` (equivalent to `true`), `html` (mostly used during testing with TextMate), and `false`, which produces no color."], |