diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-03-30 23:31:00 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-03-30 23:31:00 -0400 |
commit | 145381985237e83c633550b7dd562d86896b1b5e (patch) | |
tree | 5d4a4c18aaf37ef58d83a7f145747ca0498ef6f7 /lib/sisu/v2/param.rb | |
parent | debian/changelog (3.0.5-3) (diff) | |
parent | vim colorscheme slate, rearrange (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/param.rb')
-rw-r--r-- | lib/sisu/v2/param.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index 655177a7..c500c282 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -908,7 +908,7 @@ module SiSU_Param skip unless fns_array # consider @markup_version=SiSU_Markup_type::Markup_identify.new(fns_array,@opt).markup_version? #% determine markup version if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/ #check markup and markup version - if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:[0-9]+)?(?:\.[0-9]+)?(?:\.[0-9]+)?$/ #check markup and markup version + if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:(?:[0-9]+?)(?:\.[0-9]+?)(?:\.[0-9]+))?$/ #check markup and markup version @markup_version_declared=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1] 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 |