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

Merge branch 'bugfix/idf_tools_not_found_issue_v4.2' into 'release/v4.2'

Browse Source 
tools: Catch OSError which is raised when the tool is not available (v4.2)

See merge request espressif/esp-idf!14134
This commit is contained in:
Roland Dobai
2021-07-13 15:42:46 +00:00
parent 4e0b8678e4 68c1999df3
commit 68b6bc661b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/idf_tools.py
View File

@@ -857,12 +857,15 @@ def get_python_env_path():
with open(version_file_path, "r") as version_file: with open(version_file_path, "r") as version_file:
idf_version_str = version_file.read() idf_version_str = version_file.read()
else: else:
idf_version_str = ''
try: try:
idf_version_str = subprocess.check_output(['git', 'describe'], idf_version_str = subprocess.check_output(['git', 'describe'],
cwd=global_idf_path, env=os.environ).decode() cwd=global_idf_path, env=os.environ).decode()
except OSError:
# OSError should cover FileNotFoundError and WindowsError
warn('Git was not found')
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
warn('Git describe was unsuccessul: {}'.format(e)) warn('Git describe was unsuccessul: {}'.format(e.output))
idf_version_str = ''
match = re.match(r'^v([0-9]+\.[0-9]+).*', idf_version_str) match = re.match(r'^v([0-9]+\.[0-9]+).*', idf_version_str)
if match: if match:
idf_version = match.group(1) idf_version = match.group(1)