Преглед на файлове

Merge branch 'contrib/github_pr_9749' into 'master'

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

Closes IDFGH-8261

See merge request espressif/esp-idf!20154
Roland Dobai преди 3 години
родител
ревизия
201dbb0e27
променени са 2 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 1 1
      export.fish
  2. 1 2
      export.sh

+ 1 - 1
export.fish

@@ -47,7 +47,7 @@ function __main
     set -x PATH "$IDF_ADD_PATHS_EXTRAS":"$PATH"
     set -x PATH "$IDF_ADD_PATHS_EXTRAS":"$PATH"
 
 
     echo "Checking if Python packages are up to date..."
     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
     set added_path_variables
     for entry in $PATH;
     for entry in $PATH;

+ 1 - 2
export.sh

@@ -134,9 +134,8 @@ __main() {
     eval "${idf_exports}"
     eval "${idf_exports}"
     export PATH="${IDF_ADD_PATHS_EXTRAS}:${PATH}"
     export PATH="${IDF_ADD_PATHS_EXTRAS}:${PATH}"
 
 
-    __verbose "Using Python interpreter in $(which python)"
     __verbose "Checking if Python packages are up to date..."
     __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" ]
     if [ -n "$BASH" ]
     then
     then