Permalink
Browse files

Merge branch 'CHEF-2181'

  • Loading branch information...
2 parents f3bb6ae + f6137b5 commit 073f729991aac0aaa35ea641ee9bf6f723b3e5a5 @danielsdeleo danielsdeleo committed Apr 6, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 chef/lib/chef/knife.rb
  2. +1 −1 chef/lib/chef/knife/core/ui.rb
View
2 chef/lib/chef/knife.rb
@@ -291,7 +291,7 @@ def configure_chef
self.msg("No knife configuration file found")
end
- config[:color] = config[:color] && !config[:no_color]
+ Chef::Config[:color] = config[:color] && !config[:no_color]
case config[:verbosity]
when 0
View
2 chef/lib/chef/knife/core/ui.rb
@@ -93,7 +93,7 @@ def color(string, *colors)
# determined by the value of `config[:color]`. When output is not to a
# terminal, colored output is never used
def color?
- config[:color] && stdout.tty?
+ Chef::Config[:color] && stdout.tty?
end
def ask(*args, &block)

0 comments on commit 073f729

Please sign in to comment.