Просмотр исходного кода

tools: Make Unicode from subprocess result in the CMake convert script

Fixes an issue with Python 3 in MSYS where it fails while trying to join
paths where one part is Unicode (default string on Python3) and the
second part are bytes (returned by the subprocess call).

Closes https://github.com/espressif/esp-idf/issues/5189
Roland Dobai 5 лет назад
Родитель
Сommit
4f8e2699db
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      tools/cmake/convert_to_cmake.py

+ 1 - 1
tools/cmake/convert_to_cmake.py

@@ -122,7 +122,7 @@ def convert_project(project_path):
     for p in component_paths:
         if "MSYSTEM" in os.environ:
             cmd = ["cygpath", "-w", p]
-            p = subprocess.check_output(cmd).strip()
+            p = subprocess.check_output(cmd).decode('utf-8').strip()
 
         converted_components += convert_component(project_path, p)