summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2017-09-25 14:53:05 +0100
committerPeter Powell <petpow@saberuk.com>2017-09-25 14:55:10 +0100
commitbdd854e33275302edc8a524e0e508fd10480b982 (patch)
tree139f09b644c8b2c053bc2055cac0b800be2cc655
parent8270aca2ee161ffa9a93243016266a2681b6d7ba (diff)
Fix the regex for parsing the git version in get_version.
-rw-r--r--make/common.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/make/common.pm b/make/common.pm
index 6ca280bec..ba6b03f87 100644
--- a/make/common.pm
+++ b/make/common.pm
@@ -59,7 +59,7 @@ sub get_version {
# Attempt to retrieve missing version information from Git
chomp(my $gr = `git describe --tags 2>/dev/null`);
- if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-g(\w+))?$/) {
+ if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:[a-z]+\d+)?(?:-\d+-g(\w+))?$/) {
$version{MAJOR} //= $1;
$version{MINOR} //= $2;
$version{PATCH} //= $3;