From 68c1999df3df4e4087d3d81667ef59c851116aa2 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Wed, 23 Jun 2021 11:46:00 +0200 Subject: [PATCH] tools: Catch OSError which is raised when the tool is not available Closes https://github.com/espressif/esp-idf/issues/7140 --- tools/idf_tools.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/idf_tools.py b/tools/idf_tools.py index fd7f8e3f0a..7c4413816c 100755 --- a/tools/idf_tools.py +++ b/tools/idf_tools.py @@ -857,12 +857,15 @@ def get_python_env_path(): with open(version_file_path, "r") as version_file: idf_version_str = version_file.read() else: + idf_version_str = '' try: idf_version_str = subprocess.check_output(['git', 'describe'], 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: - warn('Git describe was unsuccessul: {}'.format(e)) - idf_version_str = '' + warn('Git describe was unsuccessul: {}'.format(e.output)) match = re.match(r'^v([0-9]+\.[0-9]+).*', idf_version_str) if match: idf_version = match.group(1)