From e8d7e6549bb47ff5adaea5e6ff1e5fc6410317dd Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 26 Jan 2014 15:09:37 +0000 Subject: [PATCH] Handle betas in do-release.pl --- do-release.pl | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/do-release.pl b/do-release.pl index 1b7b40cb4c..86d485a508 100644 --- a/do-release.pl +++ b/do-release.pl @@ -49,7 +49,16 @@ die "Can't find ftp directory $ftpdir" unless -d $ftpdir; my @files = <$tmpdir/*>; my $version = $files[0]; -$version =~ s/^.*\/openssl-(\d+\.\d+\.\d+[a-z]*)\..*$/$1/; + +if ($version =~ /beta/) + { + $version =~ s/^.*\/openssl-(\d+\.\d+\.\d+[a-z]*-beta\d+)\..*$/$1/; + } +else + { + $version =~ s/^.*\/openssl-(\d+\.\d+\.\d+[a-z]*)\..*$/$1/; + } + my $announce = "$tmpdir/openssl-$version.txt.asc"; my @distfiles = ( @@ -88,8 +97,12 @@ foreach (@distfiles) exit 1 if $bad; print "Directory sanity check OK\n"; + +my $annversion = $version; + +$annversion =~ s/-beta(\d+$)/ beta $1/; -print "Starting release for OpenSSL $version\n"; +print "Starting release for OpenSSL $annversion\n"; if ($do_copy) { @@ -107,7 +120,7 @@ else print "Test mode: no files copied\n"; } -$mail =~ s/SUBJECT/"OpenSSL version $version released"/; +$mail =~ s/SUBJECT/"OpenSSL version $annversion released"/; $mail =~ s/RECIP/openssl-dev openssl-users openssl-announce/; $mail =~ s/BODY/$announce/; -- 2.34.1