blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-11 10:09:08 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/saving-esp-idf-env-as-utf8-v5.1' into 'release/v5.1'

Browse Source 
build system: fix init.bat crash in windows when folder contains unicode characters (v5.1)

See merge request espressif/esp-idf!24666
This commit is contained in:
Zim Kalinowski 2023-07-11 16:00:15 +08:00
commit 7e3463768f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/idf_tools.py
View File

@ -1198,7 +1198,7 @@ class IDFEnv:
if global_idf_tools_path: # mypy fix for Optional[str] in the next call if global_idf_tools_path: # mypy fix for Optional[str] in the next call
# the directory doesn't exist if this is run on a clean system the first time # the directory doesn't exist if this is run on a clean system the first time
mkdir_p(global_idf_tools_path) mkdir_p(global_idf_tools_path)
with open(idf_env_file_path, 'w') as w: with open(idf_env_file_path, 'w', encoding='utf-8') as w:
info('Updating {}'.format(idf_env_file_path)) info('Updating {}'.format(idf_env_file_path))
json.dump(dict(self), w, cls=IDFEnvEncoder, ensure_ascii=False, indent=4) # type: ignore json.dump(dict(self), w, cls=IDFEnvEncoder, ensure_ascii=False, indent=4) # type: ignore
except (IOError, OSError): except (IOError, OSError):
@ -1215,7 +1215,7 @@ class IDFEnv:
idf_env_obj = cls() idf_env_obj = cls()
try: try:
idf_env_file_path = os.path.join(global_idf_tools_path or '', IDF_ENV_FILE) idf_env_file_path = os.path.join(global_idf_tools_path or '', IDF_ENV_FILE)
with open(idf_env_file_path, 'r') as idf_env_file: with open(idf_env_file_path, 'r', encoding='utf-8') as idf_env_file:
idf_env_json = json.load(idf_env_file) idf_env_json = json.load(idf_env_file)
try: try: