aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-11-27 07:36:13 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2017-11-27 20:53:27 +0200
commit91d8784a046e8dcb11e3a58e228dfd30687f85e3 (patch)
tree3d130e1f7f52cd5a5bb146b7a4e538970b26e75a
parent11f1fc913d32adfd15b4d65cb25f06183361781b (diff)
downloadmeson-91d8784a046e8dcb11e3a58e228dfd30687f85e3.zip
meson-91d8784a046e8dcb11e3a58e228dfd30687f85e3.tar.gz
meson-91d8784a046e8dcb11e3a58e228dfd30687f85e3.tar.bz2
configure_file: Compare difference in binary mode
Otherwise Python will try to use string decode on the configured file and fail if it contains characters that can't be mapped to the current encoding.
-rw-r--r--mesonbuild/mesonlib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 686f7d9..a35345b 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -534,7 +534,7 @@ def replace_if_different(dst, dst_tmp):
# unnecessary rebuilds.
different = True
try:
- with open(dst, 'r') as f1, open(dst_tmp, 'r') as f2:
+ with open(dst, 'rb') as f1, open(dst_tmp, 'rb') as f2:
if f1.read() == f2.read():
different = False
except FileNotFoundError: