diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-06-22 01:18:03 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-06-22 01:18:03 -0400 |
| commit | 6bf6c320b8ad2cb5aa588575565af70b437aa322 (patch) | |
| tree | b2c92c4b75de5c9dcbfb6639e56aac38cf545e67 /lib/sisu/v5/git.rb | |
| parent | debian/changelog (4.1.4-1) (diff) | |
| parent | v5: general code cleaning (diff) | |
Merge tag 'sisu_4.1.5' into debian/sid
SiSU 4.1.5
Diffstat (limited to 'lib/sisu/v5/git.rb')
| -rw-r--r-- | lib/sisu/v5/git.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/v5/git.rb index eb5a9b99..73cce507 100644 --- a/lib/sisu/v5/git.rb +++ b/lib/sisu/v5/git.rb @@ -75,7 +75,7 @@ module SiSU_Git end if @env.output_dir_structure.multilingual? m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss - fnn,fnb,fnt=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3] + fnb,fnt=@opt.fns[m,2],@opt.fns[m,3] else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/ fnb=@fnn=@opt.fns[m,1] fnt=@opt.fns[m,2] @@ -189,7 +189,7 @@ module SiSU_Git end def locate_parse_file composite_src=@opt.fns=~/\.ssm$/ ? true : false - parse_file=if composite_src \ + if composite_src \ and @opt.cmd.inspect !~/m/ ##SiSU_Assemble::Composite.new(@opt).read #SiSU_DAL::Source.new(@opt).read # -m |