Skip to content

Commit f107dad

Browse files
hakanjanssonkartben
authored andcommitted
west: runners: openocd: Fix version format regression
Change OpenOCD version regex to be compatible again with format strings not having a space or newline immediately after the version nr. Modified regex has been verified with the strings listed below. Ubuntu: "Open On-Chip Debugger 0.11.0" ADI: "Open On-Chip Debugger (Analog Devices 0.12.0-1.1.1) OpenOCD 0.12.0 (2024- 08-27-17:25)" Zephyr SDK: "Open On-Chip Debugger 0.11.0+dev-00728-gb6f95a16c (2024-02-17-23:51)" Infineon: "Open On-Chip Debugger 0.12.0+dev-5.2.1.3248 (2024-08-08-17:29)" Espressif: "Open On-Chip Debugger v0.12.0-esp32-20240318 (2024-03-18-18:25)" Fixes: 1c05f21 Signed-off-by: Hakan Jansson <hakan.jansson@infineon.com>
1 parent cd9bcd8 commit f107dad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/west_commands/runners/openocd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def read_version(self):
233233
stderr=subprocess.STDOUT).decode()
234234

235235
# Account for version info format of ADI fork of OpenOCD as well
236-
version_match = re.search(r"Open On-Chip Debugger.* v?(\d+.\d+.\d+)[ \n]", out)
236+
version_match = re.search(r"Open On-Chip Debugger.* v?(\d+.\d+.\d+)", out)
237237
version = version_match.group(1).split('.')
238238

239239
return [to_num(i) for i in version]

0 commit comments

Comments
 (0)