diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-11 16:40:00 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:48:28 -0700 |
| commit | d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5 (patch) | |
| tree | 5e010d14fd0313cbe831ac116458d4cbe7575c56 /lib | |
| parent | 9ebe500c496f76c5678fcde9c52d65c8282c9fe6 (diff) | |
| download | puppet-d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5.tar.gz puppet-d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5.tar.xz puppet-d9c3b0f5ac1e8f7ccbdb4b4edd2fa3e93fe882a5.zip | |
(#8356) Color defaults to false on Windows
Windows consoles do not support ansi escape sequences for colorizing
output. This commit changes the default setting of 'color' to false when
the "microsoft_windows" feature is present.
Paired-with: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit d7d384ec0b7f28a8f0be20defcc2eebd0550aff0)
Diffstat (limited to 'lib')
| -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 d714305b3..85626b2f9 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."], |