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

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

tools: Make Unicode from subprocess result in the CMake convert script (v4.0)

See merge request espressif/esp-idf!8544
Angus Gratton 5 лет назад
Родитель
Сommit
fa527dc6b3
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)