espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(tools): idf_tools.py uninstall decide based on preferred tool version

Browse Source 
idf_tools.py uninstall now doesn't take only recommended version, but
makes the decision based on preferred installed versions.
This commit is contained in:
Marek Fiala
2025-06-02 16:07:24 +02:00
parent 5f239a862b
commit 0765257558
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/idf_tools.py
View File

@@ -2555,8 +2555,10 @@ def action_uninstall(args): # type: (Any) -> None
for tool in installed_tools: for tool in installed_tools:
tool_versions = os.listdir(os.path.join(tools_path, tool)) if os.path.isdir(os.path.join(tools_path, tool)) else [] tool_versions = os.listdir(os.path.join(tools_path, tool)) if os.path.isdir(os.path.join(tools_path, tool)) else []
try: try:
unused_versions = ([x for x in tool_versions if x != tools_info[tool].get_recommended_version()]) unused_versions = [x for x in tool_versions if x != tools_info[tool].get_preferred_installed_version()]
except KeyError: # When tool that is not supported by tools_info (tools.json) anymore, remove the whole tool file except (
KeyError
): # When tool that is not supported by tools_info (tools.json) anymore, remove the whole tool file
unused_versions = [''] unused_versions = ['']
if unused_versions: if unused_versions:
unused_tools_versions[tool] = unused_versions unused_tools_versions[tool] = unused_versions
@@ -2601,7 +2603,7 @@ def action_uninstall(args): # type: (Any) -> None
tool_name, tool_version = tool_spec.split('@', 1) tool_name, tool_version = tool_spec.split('@', 1)
tool_obj = tools_info_for_platform[tool_name] tool_obj = tools_info_for_platform[tool_name]
if tool_version is None: if tool_version is None:
tool_version = tool_obj.get_recommended_version() tool_version = tool_obj.get_preferred_installed_version()
# mypy-checks # mypy-checks
if tool_version is not None: if tool_version is not None:
archive_version = tool_obj.versions[tool_version].get_download_for_platform(CURRENT_PLATFORM) archive_version = tool_obj.versions[tool_version].get_download_for_platform(CURRENT_PLATFORM)