diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:21:14 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:21:14 -0400 |
| commit | 03f79b10f928c7bb7791b7ea3ee9e8222eb15cc9 (patch) | |
| tree | 9f1f7de42705f734d8d456f3708db19146804ecf /lib/sisu/v6/ao_composite.rb | |
| parent | debian/changelog (5.5.5-1) (diff) | |
| parent | v6: hub, further changes related to use of opt.act; hub file split (diff) | |
Merge tag 'sisu_5.5.6' into debian/sid
SiSU 5.5.6
Diffstat (limited to 'lib/sisu/v6/ao_composite.rb')
| -rw-r--r-- | lib/sisu/v6/ao_composite.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/v6/ao_composite.rb index eaa4e08f..d5f8974e 100644 --- a/lib/sisu/v6/ao_composite.rb +++ b/lib/sisu/v6/ao_composite.rb @@ -62,7 +62,7 @@ =end module SiSU_Assemble - require_relative 'sysenv' # sysenv.rb + require_relative 'se' # se.rb class RemoteImage def initialize @env=SiSU_Env::InfoEnv.new @@ -114,7 +114,7 @@ module SiSU_Assemble end Dir.chdir(pwd) rescue - SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -157,7 +157,7 @@ module SiSU_Assemble end tuned_file=tuned_file.flatten.compact rescue - SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -253,7 +253,7 @@ module SiSU_Assemble fns_array=IO.readlines(@opt.fns,'') insertions?(fns_array) rescue - SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure |