Allow version to end in alphanumerics

diff --git a/cvstools/nextversion b/cvstools/nextversion
index 1cb39dcb78c7f3871517dc653ec2348bcdb68e7d..68b3438dd8aedf56a4b9fbf4d518a1d08c986bd1 100755 (executable)
--- a/cvstools/nextversion
+++ b/cvstools/nextversion
@@ -11,17 +11,11 @@ my $usage = "Usage: $0 [-v version]\n";
 die $usage if ! getopts('v:');
 my $version = $opt_v || undef;
 
-my @cvsbad = `cvs -n update 2>&1 | grep -v ^cvs`;
-if (@cvsbad) {
-    print STDERR @cvsbad;
-    die "CVS is not up-to-date!\n";
-}
-
 open (F, 'VERSION') || die "Cannot find VERSION.\n";
 read (F, $_, -s 'VERSION');
 close (F);
 
-if (/^(.*name=.VERSION.>)([\.\d]+)\+?(<.*)$/s) {
+if (/^(.*name=.VERSION.>)([\.\d]+.*?)\+?(<.*)$/s) {
     # ok
 } elsif (/^(.*?)([\.\d]+)\+?(.*)$/s) {
     # ok
@@ -33,6 +27,12 @@ my $pre = $1;
 my $fvers = $2;
 my $post = $3;
 
+my @cvsbad = `cvs -n update 2>&1 | grep -v ^cvs`;
+if (@cvsbad) {
+    print STDERR @cvsbad;
+    die "CVS is not up-to-date!\n";
+}
+
 my $major = undef;
 my $middle = undef;
 my $minor = undef;