diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-11-02 21:28:40 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-11-02 21:28:40 -0500 |
| commit | ba8e6f4bcdd82461e25dc1e9dd8166f2da43ec8a (patch) | |
| tree | ee01f9e60bb44a8a7eebb690ab2a7e48baa0d537 /lib | |
| parent | debian/changelog (5.7.1-1) (diff) | |
| parent | v5 v6: ao, composite documents, on --verbose report loading of .sst files, fix (diff) | |
Merge tag 'sisu_5.7.2' into debian/sid
SiSU 5.7.2 (fix for Debian Jessie)
package as 'sisu_5.7.1-2'
seek Debian Release Team freeze exception
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v5/ao_composite.rb | 16 | ||||
| -rw-r--r-- | lib/sisu/v6/ao_composite.rb | 16 |
2 files changed, 18 insertions, 14 deletions
diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/v5/ao_composite.rb index a81e3003..c570d05f 100644 --- a/lib/sisu/v5/ao_composite.rb +++ b/lib/sisu/v5/ao_composite.rb @@ -133,7 +133,7 @@ module SiSU_Assemble begin if FileTest.file?(loadfilename) insert_array=IO.readlines(loadfilename,'') - if loadfilename =~/\S+?\.ss[im]$/ + if loadfilename =~/\S+?\.ss[itm]$/ if (@opt.act[:verbose][:set]==:on \ || @opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) @@ -143,12 +143,14 @@ module SiSU_Assemble loadfilename, ).txt_grey end - insert_array.each do |para| - tuned_file << insert?(para) - end - elsif loadfilename =~/\S+?\.sst$/ - insert_array.each do |para| - tuned_file << para + if loadfilename =~/\S+?\.ss[im]$/ + insert_array.each do |para| + tuned_file << insert?(para) + end + elsif loadfilename =~/\S+?\.sst$/ + insert_array.each do |para| + tuned_file << para + end end end end diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/v6/ao_composite.rb index 64c6c11f..1cf7b45d 100644 --- a/lib/sisu/v6/ao_composite.rb +++ b/lib/sisu/v6/ao_composite.rb @@ -133,7 +133,7 @@ module SiSU_Assemble begin if FileTest.file?(loadfilename) insert_array=IO.readlines(loadfilename,'') - if loadfilename =~/\S+?\.ss[im]$/ + if loadfilename =~/\S+?\.ss[itm]$/ if (@opt.act[:verbose][:set]==:on \ || @opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) @@ -143,12 +143,14 @@ module SiSU_Assemble loadfilename, ).txt_grey end - insert_array.each do |para| - tuned_file << insert?(para) - end - elsif loadfilename =~/\S+?\.sst$/ - insert_array.each do |para| - tuned_file << para + if loadfilename =~/\S+?\.ss[im]$/ + insert_array.each do |para| + tuned_file << insert?(para) + end + elsif loadfilename =~/\S+?\.sst$/ + insert_array.each do |para| + tuned_file << para + end end end end |