From bc1ecea7f7fb336d067d0eb166a48be920dc7035 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Mon, 31 Mar 2025 05:28:53 -0400 Subject: [PATCH] flashtool: handle situation where software version is not reported Signed-off-by: Eric Callahan --- scripts/flashtool.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/flashtool.py b/scripts/flashtool.py index 4ab9f8e..b5f7864 100755 --- a/scripts/flashtool.py +++ b/scripts/flashtool.py @@ -285,9 +285,12 @@ class CanFlasher: raise FlashError("Invalid Block Size: %d" % (self.block_size,)) mcu_info = mcu_info.rstrip(b"\x00") if self.proto_version >= (1, 1, 0): - mcu_bytes, sv_bytes = mcu_info.split(b"\x00", maxsplit=1) - mcu_type = mcu_bytes.decode() - self.software_version = sv_bytes.decode() + build_info = mcu_info.split(b"\x00", maxsplit=1) + mcu_type = build_info[0].decode() + if len(build_info) == 2: + self.software_version = build_info[1].decode() + else: + output_line("Katapult build not reporting software version!") else: mcu_type = mcu_info.decode() output_line(