Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Modify version parsing for localversion

Browse source 
The regex used for validating version strings was updated to allow
for an optional localversion component. The piece of the version string
also needs to be removed before parsing a possible commit number.
This commit is contained in:
Peter Cullen 2024-04-04 16:36:05 +00:00 • committed by Christian Kreibich
parent e97ba8a4f6
commit e4942d45b9
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/base/misc/version.zeek
View file

@ -56,7 +56,7 @@ export {
function parse(version_string: string): VersionDescription function parse(version_string: string): VersionDescription
{ {
if ( /[0-9]+\.[0-9]+(\.[0-9]+)?(-(beta|rc|dev)[0-9]*)?((-|\.)[0-9]+)?(-debug)?/ != version_string ) if ( /[0-9]+\.[0-9]+(\.[0-9]+)?(-(beta|rc|dev)[0-9]*)?((-|\.)[0-9]+)?(-[a-zA-Z0-9]+)?(-debug)?/ != version_string )
{ {
Reporter::error(fmt("Version string %s cannot be parsed", version_string)); Reporter::error(fmt("Version string %s cannot be parsed", version_string));
return VersionDescription($version_number=0, $major=0, $minor=0, $patch=0, $commit=0, $beta=F, $debug=F, $version_string=version_string); return VersionDescription($version_number=0, $major=0, $minor=0, $patch=0, $commit=0, $beta=F, $debug=F, $version_string=version_string);
@ -92,6 +92,8 @@ function parse(version_string: string): VersionDescription
vs = gsub(vs, /-debug$/, ""); vs = gsub(vs, /-debug$/, "");
vs = gsub(vs, /-(beta|rc|dev)[0-9]*/, ""); vs = gsub(vs, /-(beta|rc|dev)[0-9]*/, "");
# Drop the optional local version piece
vs = gsub(vs, /-[a-zA-Z0-9]+$/, "");
# Either a .X, or -X possibly remaining # Either a .X, or -X possibly remaining
vs = lstrip(vs, ".-"); vs = lstrip(vs, ".-");