From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 16 May 2002 17:39:41 +0000 (+0000)
Subject: Allow version to end in alphanumerics
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6618083185a5089c093ead3d0b5e1d0858de306;p=docbook-dsssl

Allow version to end in alphanumerics
---

diff --git a/cvstools/nextversion b/cvstools/nextversion
index 1cb39dcb7..68b3438dd 100755
--- 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;