coerce mk_exim_release.pl to accept 4.80.1 exim-4_80_security github/exim-4_80_security
authorPhil Pennock <pdp@exim.org>
Thu, 25 Oct 2012 03:50:21 +0000 (23:50 -0400)
committerPhil Pennock <pdp@exim.org>
Thu, 25 Oct 2012 03:50:21 +0000 (23:50 -0400)
release-process/scripts/mk_exim_release.pl

index fe18da106c609af9ed77ae1b9316c485cc819f32..d1e950af1f5b0383416cbfc6d9d4210ea219f4aa 100755 (executable)
@@ -23,12 +23,12 @@ sub get_and_check_version {
 
     # make sure this looks like a real release version
     # which should (currently) be 4.xx or 4.xx_RCx
-    unless ( $release =~ /^(4\.\d\d(?:_RC\d+)?)$/ ) {
+    unless ( $release =~ /^(4\.\d\d(?:(?:_RC\d+)|\.\d+)?)$/ ) {
         croak "The given version number does not look right - $release";
     }
     my $full_release  = $1;              # untainted here...
     my $trunc_release = $full_release;
-    $trunc_release =~ s/^(4\.\d\d)(?:_RC\d+)?$/$1/;
+    $trunc_release =~ s/^(4\.\d\d\.\d+)(?:_RC\d+)?$/$1/;
 
     $context->{release}  = $full_release;
     $context->{trelease} = $trunc_release;