diff options
| author | danielsdeleo <dan@opscode.com> | 2013-10-14 15:26:27 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2013-10-16 13:53:37 -0700 |
| commit | 1108f332624b2eb138677ec55110162f8de9a208 (patch) | |
| tree | 79d74bfe3698233aa6b29a02b0640e03b5521f02 /lib/chef/application.rb | |
| parent | dd998f23aa904011fa3aeef40e2fae31273ad4e5 (diff) | |
| download | chef-1108f332624b2eb138677ec55110162f8de9a208.tar.gz | |
Use function args for error messages in config file loading
Diffstat (limited to 'lib/chef/application.rb')
| -rw-r--r-- | lib/chef/application.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index 7b57556ce2..d6c3a028f5 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -217,11 +217,10 @@ class Chef::Application def apply_config(config_content, config_file_path) Chef::Config.from_string(config_content, config_file_path) - Chef::Config.merge!(config) rescue Chef::Exceptions::ConfigurationError => error - Chef::Application.fatal!("Error processing config file #{config[:config_file]} with error #{error.message}", 2) + Chef::Application.fatal!("Error processing config file #{config_file_path} with error #{error.message}", 2) rescue Exception => error - Chef::Application.fatal!("Unknown error processing config file #{config[:config_file]} with error #{error.message}", 2) + Chef::Application.fatal!("Unknown error processing config file #{config_file_path} with error #{error.message}", 2) end class << self |