diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:11:09 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:11:09 -0400 |
commit | b3006eb0268887ec481c4d46e4602a3a9a2275e8 (patch) | |
tree | 54d8b4fb9f0c2744aa6096b546fe6277c184d273 /lib/sisu/v4/git.rb | |
parent | debian/changelog (4.1.5-1) (diff) | |
parent | v4: general code cleaning, sync with v5 (diff) |
Merge tag 'sisu_4.1.6' into debian/sid
SiSU 4.1.6
Diffstat (limited to 'lib/sisu/v4/git.rb')
-rw-r--r-- | lib/sisu/v4/git.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v4/git.rb b/lib/sisu/v4/git.rb index 799c505e..f2291ba9 100644 --- a/lib/sisu/v4/git.rb +++ b/lib/sisu/v4/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 |