Merge branch 'contrib/github_pr_9749_v5.0' into 'release/v5.0'

Fix export.sh failure if python 2.x is unavailable (GitHub PR) (v5.0)

See merge request espressif/esp-idf!20156
This commit is contained in:
Jiang Jiang Jian
2022-09-19 11:04:27 +08:00
2 changed files with 2 additions and 3 deletions

View File

@ -47,7 +47,7 @@ function __main
set -x PATH "$IDF_ADD_PATHS_EXTRAS":"$PATH"
echo "Checking if Python packages are up to date..."
python "$IDF_PATH"/tools/idf_tools.py check-python-dependencies || return 1
"$ESP_PYTHON" "$IDF_PATH"/tools/idf_tools.py check-python-dependencies || return 1
set added_path_variables
for entry in $PATH;

View File

@ -134,9 +134,8 @@ __main() {
eval "${idf_exports}"
export PATH="${IDF_ADD_PATHS_EXTRAS}:${PATH}"
__verbose "Using Python interpreter in $(which python)"
__verbose "Checking if Python packages are up to date..."
python "${IDF_PATH}/tools/idf_tools.py" check-python-dependencies || return 1
"$ESP_PYTHON" "${IDF_PATH}/tools/idf_tools.py" check-python-dependencies || return 1
if [ -n "$BASH" ]
then