summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorIgnacio Etcheverry <neikeq@users.noreply.github.com>2018-07-01 01:17:06 +0200
committerGitHub <noreply@github.com>2018-07-01 01:17:06 +0200
commit68c106d60d66d9b685ecbed8dac6b6ce7b50f42a (patch)
tree129840e81ddea9a0018a8556a70de8e78dde0e63 /modules
parentb3627e29f0bbb67813fe518ad55e9509b4752e6c (diff)
parent753230c275c21f991622ad550cf5219349294d3e (diff)
Merge pull request #19768 from KellyThomas/env-string
mono: convert unicode mono root path to ascii string
Diffstat (limited to 'modules')
-rw-r--r--modules/mono/mono_reg_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/mono_reg_utils.py b/modules/mono/mono_reg_utils.py
index 9c188d07a7..c8ebb54ded 100644
--- a/modules/mono/mono_reg_utils.py
+++ b/modules/mono/mono_reg_utils.py
@@ -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 ''