diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-01-24 20:49:58 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-01-24 20:49:58 -0500 |
| commit | 0fc8f80a23ad8bc2213af84c169fbc1828978f8a (patch) | |
| tree | bba9b57928b77c59ffbb24144af6f5b7cee8efb4 /lib/sisu/v3/param.rb | |
| parent | debian/changelog (4.0.1-1) [posted to experimental, awaiting Wheezy freeze end] (diff) | |
| parent | v4 v3: epub, epub_format, provide full depth epub table of contents (diff) | |
Merge tag 'sisu_4.0.2' into debian/sid
Diffstat (limited to 'lib/sisu/v3/param.rb')
| -rw-r--r-- | lib/sisu/v3/param.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index c4befa26..0212c500 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -1169,7 +1169,7 @@ module SiSU_Param sm_a,sm_b,sm_c=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?$/)[1..3] sm_c ||=0 sv=(@opt.cmd =~/[VMv]/) ? ("SiSU version (#{@sisu_version[:version]})") : '' - s_a,s_b,s_c=@sisu_version[:version].match(/^([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?(?:\-\S+)?$/)[1..3] + s_a,s_b,s_c=@sisu_version[:version].match(/^([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?(?:[~-]\S+)?$/)[1..3] tell=(@markup_version_declared.to_f==@markup_version.determined) \ ? SiSU_Screen::Ansi.new(@opt.cmd,"Markup version (#{@markup_version.series} version #{@markup_version.determined})",sv) : SiSU_Screen::Ansi.new(@opt.cmd,"Markup version declared (#{@markup_version_declared}), determined (#{@markup_version.series} version #{@markup_version.determined})",sv) |