summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-03-11 15:22:58 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-03-11 15:22:58 -0700
commit549ea9415b4e6e31a90a777f676d6478c6faa74a (patch)
tree30232ecc0a90578a6a2da474d56e6a6a82b52e26
parent4a3a0e13f658d894989c91ee5bc85429b22d51c8 (diff)
downloadchef-549ea9415b4e6e31a90a777f676d6478c6faa74a.tar.gz
unnecessary conditional
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/client.rb10
1 files changed, 2 insertions, 8 deletions
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