alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!14136
This commit is contained in:
Ivan Grokhotkov 2021-07-02 12:18:41 +00:00
commit 69f43e4668
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/idf_tools.py
View File

@ -843,12 +843,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)
@ -1181,7 +1184,7 @@ def action_install_python_env(args): # type: ignore
if os.path.exists(virtualenv_python):
try:
subprocess.check_call([virtualenv_python, '--version'], stdout=sys.stdout, stderr=sys.stderr)
except subprocess.CalledProcessError:
except (OSError, subprocess.CalledProcessError):
# At this point we can reinstall the virtual environment if it is non-functional. This can happen at least
# when the Python interpreter was removed which was used to create the virtual environment.
reinstall = True