]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
ukify: fix parsing uname version with '+'
authorLuca Boccassi <luca.boccassi@gmail.com>
Sat, 5 Jul 2025 20:10:01 +0000 (21:10 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 4 Aug 2025 18:50:36 +0000 (19:50 +0100)
Debian started using '+' in the kernel uname version, which fails the
regex in ukify. Fix it.

(cherry picked from commit 6cc01c8cc48f4d5408fc43046cc8655170e8694b)

src/ukify/ukify.py

index 95b46b2daf908d055eb152c890545ec274dd4d6c..a6acdf9e9aea9f804934c685928b442d3eb25b5d 100755 (executable)
@@ -289,7 +289,7 @@ class UkifyConfig:
 class Uname:
     # This class is here purely as a namespace for the functions
 
-    VERSION_PATTERN = r'(?P<version>[a-z0-9._-]+) \([^ )]+\) (?:#.*)'
+    VERSION_PATTERN = r'(?P<version>[a-z0-9._+-]+) \([^ )]+\) (?:#.*)'
 
     NOTES_PATTERN = r'^\s+Linux\s+0x[0-9a-f]+\s+OPEN\n\s+description data: (?P<version>[0-9a-f ]+)\s*$'