From 02733bc654b273f17597dfaea6bec885ead88e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Mon, 31 Jan 2022 21:01:51 +0100 Subject: [PATCH] mesonlib: Fix Popen_safe_legacy() stderr assumption It may be None. This was encountered with radare's build system on Windows, where symbolextractor.py crashes without any output displayed. --- mesonbuild/mesonlib/universal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py index 27d1240dd0d8..e86fb993043e 100644 --- a/mesonbuild/mesonlib/universal.py +++ b/mesonbuild/mesonlib/universal.py @@ -1416,7 +1416,7 @@ def Popen_safe_legacy(args: T.List[str], write: T.Optional[str] = None, else: o = o.decode(errors='replace').replace('\r\n', '\n') if e is not None: - if sys.stderr.encoding: + if sys.stderr is not None and sys.stderr.encoding: e = e.decode(encoding=sys.stderr.encoding, errors='replace').replace('\r\n', '\n') else: e = e.decode(errors='replace').replace('\r\n', '\n')