diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-14 11:53:05 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-14 11:53:05 -0700 |
| commit | c031a6182bef7f689b2d80f418ae1b80669168a3 (patch) | |
| tree | 627f24bc48fd352dd82a1588a514349c5924d9eb /lib/chef/application | |
| parent | 365064280c93d519fdacbf032c0c21057e5549c9 (diff) | |
| download | chef-c031a6182bef7f689b2d80f418ae1b80669168a3.tar.gz | |
fix some UselessAssignment caseslcg/useless-assignment
Diffstat (limited to 'lib/chef/application')
| -rw-r--r-- | lib/chef/application/apply.rb | 2 | ||||
| -rw-r--r-- | lib/chef/application/windows_service.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb index 38b00f293c..03c86b86f2 100644 --- a/lib/chef/application/apply.rb +++ b/lib/chef/application/apply.rb @@ -204,7 +204,7 @@ class Chef::Application::Apply < Chef::Application parse_options run_chef_recipe Chef::Application.exit! "Exiting", 0 - rescue SystemExit => e + rescue SystemExit raise rescue Exception => e Chef::Application.debug_stacktrace(e) diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index 0328a65487..fca1ed3689 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -312,13 +312,13 @@ class Chef else ::File.open(config[:config_file]) { |f| apply_config(f.path) } end - rescue Errno::ENOENT => error + rescue Errno::ENOENT Chef::Log.warn("*****************************************") Chef::Log.warn("Did not find config file: #{config[:config_file]}, using command line options.") Chef::Log.warn("*****************************************") Chef::Config.merge!(config) - rescue SocketError => error + rescue SocketError Chef::Application.fatal!("Error getting config file #{Chef::Config[:config_file]}", 2) rescue Chef::Exceptions::ConfigurationError => error Chef::Application.fatal!("Error processing config file #{Chef::Config[:config_file]} with error #{error.message}", 2) |