Changeset 105903 in vbox

Timestamp:

Aug 29, 2024 1:52:46 PM (5 months ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Fixed versionToTuple() to also recognize our pre-release tagging semantics.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -1785 +1785 @@
             # Regular expression taken from semver.org (recommended regular expression for semantic version strings).
             # Creative Commons ― CC BY 3.0
-            oRegEx = re.compile(r'^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'); # pylint: disable=line-too-long
+            #
+            # Modified to also recognize our semantics:
+            # - We use "-BETA2" instead of "_BETA2".
+            oRegEx = re.compile(r'^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:[-|_]((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'); # pylint: disable=line-too-long
             oMatch = oRegEx.search(sVer);
             return oMatch.groups();