summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel DeLeo <dan@opscode.com>2011-04-12 11:20:19 -0700
committerDaniel DeLeo <dan@opscode.com>2011-04-12 11:20:19 -0700
commita940c6d3d20966e7cf7444cc9c9862f5ceaefa5b (patch)
treef20eb1a306e2d9d7c3bc0d18486bf51c7f475ce4
parent11198fe9b641127084ce3c062a54d8c3842f19b5 (diff)
parent675bac8b23393b716aef475c0c27470dc0c55c0e (diff)
downloadchef-a940c6d3d20966e7cf7444cc9c9862f5ceaefa5b.tar.gz
Merge branch 'CHEF-2217'
-rw-r--r--chef/lib/chef/knife/core/ui.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/chef/lib/chef/knife/core/ui.rb b/chef/lib/chef/knife/core/ui.rb
index d402d60f58..dbea91134e 100644
--- a/chef/lib/chef/knife/core/ui.rb
+++ b/chef/lib/chef/knife/core/ui.rb
@@ -93,7 +93,7 @@ class Chef
# determined by the value of `config[:color]`. When output is not to a
# terminal, colored output is never used
def color?
- Chef::Config[:color] && stdout.tty?
+ Chef::Config[:color] && stdout.tty? && (RUBY_PLATFORM !~ /mswin|mingw32|windows/)
end
def ask(*args, &block)