aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriel D'Alessandro <ariel@vanguardiasur.com.ar>2020-04-13 19:07:01 -0300
committerJussi Pakkanen <jpakkane@gmail.com>2020-04-14 23:20:39 +0300
commit55f02c19497a0436975f682fdb0efa121c471a29 (patch)
treeef295a5915b710f19a2c2e06ca85c4ddb6ee8b08
parentb1b3987d9cc9302175829afa242046c734bc6d68 (diff)
downloadmeson-55f02c19497a0436975f682fdb0efa121c471a29.zip
meson-55f02c19497a0436975f682fdb0efa121c471a29.tar.gz
meson-55f02c19497a0436975f682fdb0efa121c471a29.tar.bz2
interpreter: find_program: Store program's name when not found
Currently, looking for a nonexisting program using find_program() will return an NonExistingExternalProgram instace with the default name 'nonexistingprogram'. Let's store the target program's name in it, so it can be printed if needed. Signed-off-by: Ariel D'Alessandro <ariel@vanguardiasur.com.ar>
-rw-r--r--mesonbuild/interpreter.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index b2ca49f..c1636d7 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3218,7 +3218,7 @@ external dependencies (including libraries) must go to "dependencies".''')
if required and (progobj is None or not progobj.found()):
raise InvalidArguments('Program(s) {!r} not found or not executable'.format(args))
if progobj is None:
- return ExternalProgramHolder(dependencies.NonExistingExternalProgram())
+ return ExternalProgramHolder(dependencies.NonExistingExternalProgram(' '.join(args)))
# Only store successful lookups
self.store_name_lookups(args)
if wanted:
@@ -3231,7 +3231,7 @@ external dependencies (including libraries) must go to "dependencies".''')
if required:
m = 'Invalid version of program, need {!r} {!r} found {!r}.'
raise InvalidArguments(m.format(progobj.get_name(), not_found, version))
- return ExternalProgramHolder(dependencies.NonExistingExternalProgram())
+ return ExternalProgramHolder(dependencies.NonExistingExternalProgram(' '.join(args)))
return progobj
@FeatureNewKwargs('find_program', '0.53.0', ['dirs'])
@@ -3246,7 +3246,7 @@ external dependencies (including libraries) must go to "dependencies".''')
disabled, required, feature = extract_required_kwarg(kwargs, self.subproject)
if disabled:
mlog.log('Program', mlog.bold(' '.join(args)), 'skipped: feature', mlog.bold(feature), 'disabled')
- return ExternalProgramHolder(dependencies.NonExistingExternalProgram())
+ return ExternalProgramHolder(dependencies.NonExistingExternalProgram(' '.join(args)))
search_dirs = extract_search_dirs(kwargs)
wanted = mesonlib.stringlistify(kwargs.get('version', []))