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

Merge branch 'feature/installed_tool_failed_v4.3' into 'release/v4.3'

Browse Source 
tools: Warning about tool being installed but failed to run. (v4.3)

See merge request espressif/esp-idf!13230
This commit is contained in:
Angus Gratton
2021-05-14 01:43:37 +00:00
parent 93aee41c29 f89f5b7f75
commit acb05c21d9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/idf_tools.py
View File

@@ -568,8 +568,8 @@ class IDFTool(object):
# tool is not on the path # tool is not on the path
raise ToolNotFound('Tool {} not found'.format(self.name)) raise ToolNotFound('Tool {} not found'.format(self.name))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise ToolExecError('Command {} has returned non-zero exit code ({})\n'.format( raise ToolExecError('returned non-zero exit code ({}) with error message:\n{}'.format(
' '.join(self._current_options.version_cmd), e.returncode)) e.returncode, e.stderr.decode('utf-8',errors='ignore'))) # type: ignore
in_str = version_cmd_result.decode('utf-8') in_str = version_cmd_result.decode('utf-8')
match = re.search(self._current_options.version_regex, in_str) match = re.search(self._current_options.version_regex, in_str)
@@ -620,8 +620,9 @@ class IDFTool(object):
except ToolNotFound: except ToolNotFound:
# not in PATH # not in PATH
pass pass
except ToolExecError: except ToolExecError as e:
warn('tool {} found in path, but failed to run'.format(self.name)) warn('tool {} found in path, but {}'.format(
self.name, e))
else: else:
self.version_in_path = ver_str self.version_in_path = ver_str
@@ -639,9 +640,9 @@ class IDFTool(object):
except ToolNotFound: except ToolNotFound:
warn('directory for tool {} version {} is present, but tool was not found'.format( warn('directory for tool {} version {} is present, but tool was not found'.format(
self.name, version)) self.name, version))
except ToolExecError: except ToolExecError as e:
warn('tool {} version {} is installed, but the tool failed to run'.format( warn('tool {} version {} is installed, but {}'.format(
self.name, version)) self.name, version, e))
else: else:
if ver_str != version: if ver_str != version:
warn('tool {} version {} is installed, but has reported version {}'.format( warn('tool {} version {} is installed, but has reported version {}'.format(