summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-03-12 15:15:13 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-03-12 15:15:13 (GMT)
commite3dd392536da73b9e3940b8c19a1de835dc34d31 (patch)
tree8a172046dcdd4bca72f3363171a4b4befa4b3512
parente45225f1d11229575569ffe507f96acdc231c38d (diff)
downloadhdf5-e3dd392536da73b9e3940b8c19a1de835dc34d31.zip
hdf5-e3dd392536da73b9e3940b8c19a1de835dc34d31.tar.gz
hdf5-e3dd392536da73b9e3940b8c19a1de835dc34d31.tar.bz2
Add \d to list of characters allowed after - in versions. Version with -
and no alphabetic characters is required to allow building binaries on windows. Escape { and } in regex as required by newer version of perl in updated cori.nersc.gov. Cherry-picked c3c044cc003d6a4039635e638e1cd1c2487be177 from develop.
-rwxr-xr-xbin/h5vers2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/h5vers b/bin/h5vers
index 4200141..659a081 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -213,7 +213,7 @@ my (@curver) = getvers $contents;
# Determine the new version number.
my @newver; #new version
if ($set) {
- if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([a-zA-Z]\w*))?/) {
+ if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([\da-zA-Z]\w*))?/) {
@newver = ($1, $2, $3, $5);
} elsif ($set =~ /(\d+)\D+(\d+)\D+(\d+)(\s*\(([a-zA-Z]\w*)\))?\D*$/) {
@newver = ($1, $2, $3, $5);