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

fix(tools): Fix fatfsgen construct dependency (v5.1) See merge request espressif/esp-idf!27655
espressif · Dec 6, 2023 · ca5c8de · ca5c8de
2 parents 46d52c8 + ccc75dd
commit ca5c8de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/components/fatfs/fatfsparse.py b/components/fatfs/fatfsparse.py
@@ -57,7 +57,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):
+        except (construct.core.ConstError, UnicodeDecodeError, construct.core.StringError):
             args.long_name_support = True
             continue
 

diff --git a/tools/requirements/requirements.core.txt b/tools/requirements/requirements.core.txt
@@ -16,6 +16,7 @@ esp-idf-kconfig
 esp-idf-monitor
 esp-idf-size
 esp-idf-panic-decoder
+construct
 
 # gdb extensions dependencies
 freertos_gdb