From 3d42a1cfbc27518503c29d823d18ee2b1e2da985 Mon Sep 17 00:00:00 2001 From: Eric Holmberg Date: Wed, 8 Jan 2025 11:25:47 +1300 Subject: [PATCH] west: runners: add option 'v' prefix to OpenOCD version string The Espressif branch of OpenOCD uses the version string "v0.12.0" instead of "0.12.0" causing the version regex match to fail. Add an optional 'v' prefix to avoid the failure. Fixes: #83373 Signed-off-by: Eric Holmberg --- scripts/west_commands/runners/openocd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/west_commands/runners/openocd.py b/scripts/west_commands/runners/openocd.py index d97cec1fe1e..c37c6f57d0b 100644 --- a/scripts/west_commands/runners/openocd.py +++ b/scripts/west_commands/runners/openocd.py @@ -222,7 +222,7 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner): out = self.check_output([self.openocd_cmd[0], '--version'], stderr=subprocess.STDOUT).decode() - version_match = re.search(r"Open On-Chip Debugger (\d+.\d+.\d+)", out) + version_match = re.search(r"Open On-Chip Debugger v?(\d+.\d+.\d+)", out) version = version_match.group(1).split('.') return [to_num(i) for i in version]