diff options
| author | Daniel DeLeo <dan@opscode.com> | 2011-04-06 14:43:56 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2011-04-06 14:43:56 -0700 |
| commit | 073f729991aac0aaa35ea641ee9bf6f723b3e5a5 (patch) | |
| tree | 960b059f8403e0dfee5267fed8d3521a0e49188b | |
| parent | f3bb6ae496479344acfa2bf07fffea679662e9ef (diff) | |
| parent | f6137b5f28ba1296c76b3867430357ee2197abf1 (diff) | |
| download | chef-073f729991aac0aaa35ea641ee9bf6f723b3e5a5.tar.gz | |
Merge branch 'CHEF-2181'
| -rw-r--r-- | chef/lib/chef/knife.rb | 2 | ||||
| -rw-r--r-- | chef/lib/chef/knife/core/ui.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chef/lib/chef/knife.rb b/chef/lib/chef/knife.rb index 147fc776a3..83c0a74ab9 100644 --- a/chef/lib/chef/knife.rb +++ b/chef/lib/chef/knife.rb @@ -291,7 +291,7 @@ class 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 diff --git a/chef/lib/chef/knife/core/ui.rb b/chef/lib/chef/knife/core/ui.rb index a68edcde0c..d402d60f58 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? - config[:color] && stdout.tty? + Chef::Config[:color] && stdout.tty? end def ask(*args, &block) |