From 55f02c19497a0436975f682fdb0efa121c471a29 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Mon, 13 Apr 2020 19:07:01 -0300 Subject: 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 --- mesonbuild/interpreter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index b2ca49fb5..c1636d77d 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', [])) -- cgit v1.2.3