From cc2f649f36077b32413a899f7ae4644b5dfbc64b Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 30 May 2002 12:34:35 +0000 Subject: [PATCH] Allow version to end in allphanumerics when version isn't in XML --- cvstools/nextversion | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cvstools/nextversion b/cvstools/nextversion index 203e17c1c..12ca47061 100755 --- a/cvstools/nextversion +++ b/cvstools/nextversion @@ -17,7 +17,7 @@ close (F); if (/^(.*name=.VERSION.>)([\.\d]+.*?)\+?(<.*)$/s) { # ok -} elsif (/^(.*?)([\.\d]+)\+?(.*)$/s) { +} elsif (/^(.*?)([\.\d]+.*?)\+?\s*$/s) { # ok } else { die "Cannot find version in VERSION.\n"; @@ -45,7 +45,7 @@ if ($fvers =~ /^(\d+)\.(\d+)\.(\d+)$/) { $minor = $3; $minor++; $fvers = "$major.$middle.$minor"; -} elsif ($fvers =~ /^(\d+)\.(\d+)$/) { +} elsif ($fvers =~ /^(\d+)\.(\d+.*)$/) { $major = $1; $minor = $2; $minor++; -- 2.40.0