Explorar o código

Merge pull request #19965 from neikeq/issue-19961

Mono: Fix build script not decoding process utf-8 output
Ignacio Etcheverry %!s(int64=7) %!d(string=hai) anos
pai
achega
f8daa080f2
Modificáronse 1 ficheiros con 4 adicións e 1 borrados
  1. 4 1
      modules/mono/config.py

+ 4 - 1
modules/mono/config.py

@@ -276,7 +276,10 @@ def pkgconfig_try_find_mono_version():
 
 
 def mono_root_try_find_mono_version(mono_root):
-    first_line = subprocess.check_output([os.path.join(mono_root, 'bin', 'mono'), '--version']).splitlines()[0]
+    from compat import decode_utf8
+
+    output = subprocess.check_output([os.path.join(mono_root, 'bin', 'mono'), '--version'])
+    first_line = decode_utf8(output.splitlines()[0])
     try:
         return LooseVersion(first_line.split()[len('Mono JIT compiler version'.split())])
     except (ValueError, IndexError):