summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-10-24 23:50:21 -0400
committerPhil Pennock <pdp@exim.org>2012-10-24 23:50:21 -0400
commitf81ec65b372df1a47c8b06458925c1f0039be3b1 (patch)
tree3890697e49aca0ae5722e9ae47cdf29ad6cc5291
parent05b66bc5fbe44e744c3a56a8fada6841a2143976 (diff)
downloadexim4-exim-4_80_security.tar.gz
coerce mk_exim_release.pl to accept 4.80.1exim-4_80_security
-rwxr-xr-xrelease-process/scripts/mk_exim_release.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index fe18da106..d1e950af1 100755
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -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;