fix debian and Ubuntu version detection

This fixes an issue with the Debian version information where it was retrieving a number instead of the codename. This also fixes an issue where the version of Ubuntu was incomplete and it was retrieving only the first part of it, rather than the full version. Signed-off-by: David Negreira <[email protected]>
avocado-framework · Sep 13, 2024 · a44d5ab · a44d5ab
1 parent 536b6f7
commit a44d5ab
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/avocado/utils/distro.py b/avocado/utils/distro.py
@@ -387,7 +387,7 @@ class DebianProbe(Probe):
 
     CHECK_FILE = "/etc/debian_version"
     CHECK_FILE_DISTRO_NAME = "debian"
-    CHECK_VERSION_REGEX = re.compile(r"(\d+)\.(\d+)")
+    CHECK_VERSION_REGEX = re.compile(r"(.+)/(.+)")
 
 
 class UbuntuProbe(Probe):
@@ -399,7 +399,7 @@ class UbuntuProbe(Probe):
     CHECK_FILE_CONTAINS = "ubuntu"
     CHECK_FILE_DISTRO_NAME = "Ubuntu"
     CHECK_VERSION_REGEX = re.compile(
-        r".*VERSION_ID=\"(\d+)\.(\d+)\".*", re.MULTILINE | re.DOTALL
+        r".*VERSION_ID=\"(\d+\.\d+)\".*", re.MULTILINE | re.DOTALL
     )