diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-08-21 23:22:34 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-08-21 23:22:34 -0400 |
| commit | 2c5b71e36a335fc89c5198259166ed7de478819c (patch) | |
| tree | 6e7abab3e67b2735428a3d0bf80baa964864b29d /lib/sisu/v4/db_import.rb | |
| parent | debian/changelog (4.1.11-1) (diff) | |
| parent | v5: vim syntax additions, sisu.vim (diff) | |
Merge tag 'sisu_4.1.12' into debian/sid
SiSU 4.1.12
Diffstat (limited to 'lib/sisu/v4/db_import.rb')
| -rw-r--r-- | lib/sisu/v4/db_import.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb index 4f77cdb0..240efd67 100644 --- a/lib/sisu/v4/db_import.rb +++ b/lib/sisu/v4/db_import.rb @@ -171,7 +171,7 @@ module SiSU_DbImport STDERR.puts "Error code: #{e.err}" STDERR.puts "Error message: #{e.errstr}" STDERR.puts "Error SQLSTATE: #{e.state}" - SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do + SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql" @@ -184,7 +184,7 @@ module SiSU_DbImport puts "#{__FILE__}:#{__LINE__}" end rescue - SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do + SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end sqlfn="#{@env.processing_path.sql}/#{@md.fnb}.sql" @@ -569,7 +569,7 @@ module SiSU_DbImport end end rescue - SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do + SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -702,7 +702,7 @@ module SiSU_DbImport t=SiSU_DbTuple::LoadUrls.new(@conn,f,u,@@id_t,@opt,@file_maint) tuple=t.tuple rescue - SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do + SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure |