From 549ea9415b4e6e31a90a777f676d6478c6faa74a Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 11 Mar 2019 15:22:58 -0700 Subject: unnecessary conditional Signed-off-by: Lamont Granquist --- lib/chef/client.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/chef/client.rb') diff --git a/lib/chef/client.rb b/lib/chef/client.rb index 5faa080afe..edf071b4b4 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -288,20 +288,14 @@ class Chef run_failed end events.run_failed(run_error, run_status) + Chef::Application.debug_stacktrace(run_error) + raise run_error ensure Chef::RequestID.instance.reset_request_id @run_status = nil runlock.release end - # Raise converge, and other errors here so that we exit - # with the proper exit status code and everything gets raised - # as a RunFailedWrappingError - if run_error - Chef::Application.debug_stacktrace(run_error) - raise run_error - end - true end -- cgit v1.2.1