aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-08-21 13:50:48 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-08-21 13:50:48 +0300
commite3783f0f595cf00afeb41410b215d26eba228327 (patch)
treef9b047aaa4643852bd1f9d134b9c71b3961cd79d
parent399d65380394556ba5cd1c2a3b364f891d095bfe (diff)
downloadmeson-e3783f0f595cf00afeb41410b215d26eba228327.zip
meson-e3783f0f595cf00afeb41410b215d26eba228327.tar.gz
meson-e3783f0f595cf00afeb41410b215d26eba228327.tar.bz2
Check input file for existance. Closes #697.
-rw-r--r--mesonbuild/mesonlib.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 1672d95..332ecf0 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -261,7 +261,10 @@ def do_mesondefine(line, confdata):
def do_conf_file(src, dst, confdata):
- data = open(src).readlines()
+ try:
+ data = open(src).readlines()
+ except Exception:
+ raise MesonException('Could not read input file %s.' % src)
# Only allow (a-z, A-Z, 0-9, _, -) as valid characters for a define
# Also allow escaping '@' with '\@'
regex = re.compile(r'[^\\]?@([-a-zA-Z0-9_]+)@')