summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle André Vadla RavnÄs <oleavr@gmail.com>2022-01-31 21:01:51 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2022-02-04 12:35:04 +0200
commit02733bc654b273f17597dfaea6bec885ead88e0a (patch)
tree9ffd6f956748df6a1e39f7b44c20f8c30830daaa
parent5ad9e7783854de9844572c00b0d5829ecc4cbb0a (diff)
downloadmeson-02733bc654b273f17597dfaea6bec885ead88e0a.tar.gz
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.
-rw-r--r--mesonbuild/mesonlib/universal.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py
index 27d1240dd..e86fb9930 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')