diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-03-30 23:05:09 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-03-30 23:05:09 -0400 |
| commit | 350efc6d6b35b6e06130cf806f5c9d07897636d8 (patch) | |
| tree | c88d33a47cff849acb371a0686bff629cb2d8641 | |
| parent | v2, v3: 3.0.6 version & changelog "opened" (diff) | |
v2: param, nested regex match fix (backport from v3)
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v2 | 3 | ||||
| -rw-r--r-- | lib/sisu/v2/param.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 953688b2..62f4f9eb 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -15,6 +15,9 @@ Reverse Chronological: %% 2.9.1.orig.tar.gz (2011-03-30:13/3) [see 3.0.6] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1 + * (ruby 1.9.2 fixes) + * param, nested regex match backport from v3 + %% 2.9.0.orig.tar.gz (2011-03-24:12/4) [see 3.0.5] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1 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 |