From bdd854e33275302edc8a524e0e508fd10480b982 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Mon, 25 Sep 2017 14:53:05 +0100 Subject: Fix the regex for parsing the git version in get_version. --- make/common.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3