Merge pull request #171 from peace-maker/msvc_codepage_localization

Fix Windows codepage detection when using language pack
alliedmodders · Dec 15, 2024 · 545cebd · 545cebd
2 parents 551dd3f + 6792f69
commit 545cebd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ambuild2/frontend/cpp/msvc_utils.py b/ambuild2/frontend/cpp/msvc_utils.py
@@ -260,7 +260,10 @@ def GetCodePage():
                                 stdout = subprocess.PIPE,
                                 stderr = subprocess.DEVNULL,
                                 stdin = subprocess.DEVNULL).stdout
-        codec = 'cp' + re.match(b".+: (\d+)\s*$", stdout).group(1).decode()
+        code_page = re.match(br".+: (\d+)\.?\s*$", stdout)
+        if code_page is None:
+            raise LookupError("Could not determine code page")
+        codec = 'cp' + code_page.group(1).decode()
         codecs.lookup(codec)
         return codec
     except LookupError: