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

fix(tools): fix adding tar.gz archive to tools.json if tar.xz is present

Browse Source
This commit is contained in:
Alexey Lapshin 2024-11-21 11:44:59 +07:00
parent e3ceabfa1b
commit ed66c1fb7d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/idf_tools.py
View File

@ -2839,7 +2839,12 @@ def action_add_version(args: Any) -> None:
checksum_info: ChecksumFileParser = (ChecksumFileParser(filename_prefix, args.checksum_file) checksum_info: ChecksumFileParser = (ChecksumFileParser(filename_prefix, args.checksum_file)
if args.checksum_file if args.checksum_file
else ChecksumCalculator(args.artifact_file)) # type: ignore else ChecksumCalculator(args.artifact_file)) # type: ignore
updated_tools = []
for file_size, file_sha256, file_name in checksum_info: for file_size, file_sha256, file_name in checksum_info:
xz_file = file_name.replace('.tar.gz', '.tar.xz')
if xz_file in updated_tools:
# .tar.xz archives are preferable, but .tar.gz is needed, for example, when using PlatformIO
continue
# Guess which platform this file is for # Guess which platform this file is for
try: try:
found_platform = Platforms.get_by_filename(file_name) found_platform = Platforms.get_by_filename(file_name)
@ -2852,6 +2857,7 @@ def action_add_version(args: Any) -> None:
info(f' SHA256: {file_sha256}') info(f' SHA256: {file_sha256}')
info(f' URL: {url}') info(f' URL: {url}')
version_obj.add_download(found_platform, url, file_size, file_sha256) version_obj.add_download(found_platform, url, file_size, file_sha256)
updated_tools.append(file_name)
json_str = dump_tools_json(tools_info) json_str = dump_tools_json(tools_info)
if not args.output: if not args.output:
args.output = os.path.join(g.idf_path, TOOLS_FILE_NEW) # type: ignore args.output = os.path.join(g.idf_path, TOOLS_FILE_NEW) # type: ignore