diff options
author | Claire McQuin <claire@getchef.com> | 2015-05-19 17:11:10 -0700 |
---|---|---|
committer | Bryan McLellan <btm@loftninjas.org> | 2015-05-27 14:16:29 -0400 |
commit | 166a6db885fe988c71c403c7f22c1d7b1189830a (patch) | |
tree | afac877636e49f3f2dcc146de142d4724c48e646 /lib/chef/client.rb | |
parent | dd89bd93841acf8aa64a9dc21f64e09d2fe7b762 (diff) | |
download | chef-166a6db885fe988c71c403c7f22c1d7b1189830a.tar.gz |
remove configuration option
Diffstat (limited to 'lib/chef/client.rb')
-rw-r--r-- | lib/chef/client.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index bf99f003fb..8203392b39 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -539,16 +539,13 @@ class Chef end def wrap_exceptions(converge_error, audit_error) - if audit_error && !(audit_error.is_a?(Chef::Exceptions::AuditsFailed) && Chef::Config[:audit_as_warning]) - if converge_error - return Chef::Exceptions::RunFailedWrappingError.new(converge_error, audit_error) - else - return Chef::Exceptions::RunFailedWrappingError.new(audit_error) - end + err = if audit_error && !audit_error.is_a?(Chef::Exceptions::AuditsFailed) + Chef::Exceptions::RunFailedWrappingError.new(converge_error, audit_error) elsif converge_error - return Chef::Exceptions::RunFailedWrappingError.new(converge_error) + Chef::Exceptions::RunFailedWrappingError.new(converge_error) end - nil + err.fill_backtrace if err + err end end |