Merge branch 'fix/fatfsgen_construct_v5.0' into 'release/v5.0'

fix(tools): Fix fatfsgen construct dependency (v5.0)

See merge request espressif/esp-idf!27656
This commit is contained in:
Martin Vychodil 2023-12-18 21:20:23 +08:00
commit ead2652c33
2 changed files with 2 additions and 1 deletions

View File

@ -55,7 +55,7 @@ def traverse_folder_tree(directory_bytes_: bytes,
try:
obj_: dict = Entry.ENTRY_FORMAT_SHORT_NAME.parse(
directory_bytes_[obj_address_: obj_address_ + FATDefaults.ENTRY_SIZE])
except (construct.core.ConstError, UnicodeDecodeError) as e:
except (construct.core.ConstError, UnicodeDecodeError, construct.core.StringError) as e:
if not args.long_name_support:
raise e
continue

View File

@ -13,6 +13,7 @@ pyelftools
idf-component-manager
esp-coredump
esptool
construct
# kconfig and menuconfig dependencies
kconfiglib