kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'feature/installed_tool_failed' into 'master'
tools: Warning about tool being installed but failed to run. Closes IDF-2819 See merge request espressif/esp-idf!12855pull/6895/head
commit
9d093d3a04
|
@ -581,8 +581,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)) # type: ignore
|
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) # type: ignore
|
match = re.search(self._current_options.version_regex, in_str) # type: ignore
|
||||||
|
@ -633,8 +633,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
|
||||||
|
|
||||||
|
@ -652,9 +653,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(
|
||||||
|
|
Ładowanie…
Reference in New Issue