diff options
Diffstat (limited to 'lib/chef_zero/data_store/v1_to_v2_adapter.rb')
| -rw-r--r-- | lib/chef_zero/data_store/v1_to_v2_adapter.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/chef_zero/data_store/v1_to_v2_adapter.rb b/lib/chef_zero/data_store/v1_to_v2_adapter.rb index dba35b3..874c05a 100644 --- a/lib/chef_zero/data_store/v1_to_v2_adapter.rb +++ b/lib/chef_zero/data_store/v1_to_v2_adapter.rb @@ -109,17 +109,15 @@ module ChefZero private def fix_exceptions - begin - yield - rescue DataAlreadyExistsError => e - err = DataAlreadyExistsError.new([ "organizations", single_org ] + e.path, e) - err.set_backtrace(e.backtrace) - raise err - rescue DataNotFoundError => e - err = DataNotFoundError.new([ "organizations", single_org ] + e.path, e) - err.set_backtrace(e.backtrace) - raise e - end + yield + rescue DataAlreadyExistsError => e + err = DataAlreadyExistsError.new([ "organizations", single_org ] + e.path, e) + err.set_backtrace(e.backtrace) + raise err + rescue DataNotFoundError => e + err = DataNotFoundError.new([ "organizations", single_org ] + e.path, e) + err.set_backtrace(e.backtrace) + raise e end def skip_organizations?(path, name = nil) |