Merge pull request #19768 from KellyThomas/env-string

mono: convert unicode mono root path to ascii string
This commit is contained in:
Ignacio Etcheverry 2018-07-01 01:17:06 +02:00 committed by GitHub
commit 68c106d60d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -60,10 +60,10 @@ def _find_mono_in_reg_old(subkey, bits):
def find_mono_root_dir(bits):
root_dir = _find_mono_in_reg(r'SOFTWARE\Mono', bits)
if root_dir is not None:
return root_dir
return str(root_dir)
root_dir = _find_mono_in_reg_old(r'SOFTWARE\Novell\Mono', bits)
if root_dir is not None:
return root_dir
return str(root_dir)
return ''