aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-11-28 12:35:25 -0500
committerEli Schwartz <eschwartz@archlinux.org>2021-12-20 16:03:43 -0500
commitd25a33550371b2174f4224628110d427555a63b7 (patch)
treea5896f1bfbeed7276cfd2ac94f1898a80466578d
parent71ae5ccb654cd38de8b33565f99ce18ce8c12210 (diff)
downloadmeson-d25a33550371b2174f4224628110d427555a63b7.zip
meson-d25a33550371b2174f4224628110d427555a63b7.tar.gz
meson-d25a33550371b2174f4224628110d427555a63b7.tar.bz2
restore additional info about the potential cause of find_program failing
Before commit f08eed37cb69ba0d793c0f1d086eaef7f25c2ea3 we also mentioned that it might not be executable.
-rw-r--r--mesonbuild/interpreter/interpreter.py2
-rw-r--r--test cases/failing/101 no glib-compile-resources/test.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index f6aae4d..1db0588 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -1448,7 +1448,7 @@ external dependencies (including libraries) must go to "dependencies".''')
if not silent:
mlog.log('Program', mlog.bold(progobj.get_name()), 'found:', mlog.red('NO'))
if required:
- m = 'Program {!r} not found'
+ m = 'Program {!r} not found or not executable'
raise InterpreterException(m.format(progobj.get_name()))
return progobj
diff --git a/test cases/failing/101 no glib-compile-resources/test.json b/test cases/failing/101 no glib-compile-resources/test.json
index d81b0c0..7f0c02c 100644
--- a/test cases/failing/101 no glib-compile-resources/test.json
+++ b/test cases/failing/101 no glib-compile-resources/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/101 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found"
+ "line": "test cases/failing/101 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found or not executable"
}
]
}