diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-08-23 01:29:13 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-08-23 01:29:13 +0100 |
commit | 69ecb35a269c3fad8c8a34b9c8176d59365716ea (patch) | |
tree | f3d7d23a6a8ecce15cc6c485efb92f367de45590 /lib | |
parent | Merge branch 'upstream' into debian/sid (diff) | |
parent | recognise .ssm filetype in hup, make sisu --identify parse .ssm files without... (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sisu/v0/hub.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb index d1396331..12e477c0 100644 --- a/lib/sisu/v0/hub.rb +++ b/lib/sisu/v0/hub.rb @@ -548,7 +548,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ @opt.files.each do |fns| if FileTest.file?(fns) @opt.fns=fns - unless @opt.fns =~ /(?:\.(?:[_-]?sst|ssp|sx[sdn]\.xml|termsheet.rb)|sisupod(?:\.zip)?)$/ + unless @opt.fns =~ /(?:\.(?:[_-]?sst|ssm|ssp|sx[sdn]\.xml|termsheet.rb)|sisupod(?:\.zip)?)$/ if @opt.fns=~/\.kdi$/ and @opt.mod.inspect =~/--(?:convert(?:-from)?|from)[=-]kdi/ elsif @opt.fns=~/\.sx[sdn]\.xml$/ and @opt.mod.inspect =~/--(?:(?:convert(?:-from)?|from)[=-])?(?:xml2sst|sxml)/ elsif @opt.fns=~/\.ssi$/ and @opt.mod.inspect =~/--identify/ |