From 9b80874c3c7f5c361db4f31e4afc578afb22dcfb Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 10 Oct 2021 17:23:34 -0400 Subject: [PATCH] simplify some log formatting by splitting out a commonly used format string There are a bunch of cases in a single function where we would want to log the detected path of pkg-config. Formatting this is awkward. Define it once, then use f-strings everywhere. :D --- mesonbuild/dependencies/pkgconfig.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py index a7ba603f092f..251c83ef092f 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py @@ -420,21 +420,20 @@ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Union return variable def check_pkgconfig(self, pkgbin: ExternalProgram) -> T.Optional[str]: + command_as_string = ' '.join(pkgbin.get_command()) if not pkgbin.found(): mlog.log(f'Did not find pkg-config by name {pkgbin.name!r}') return None try: p, out = Popen_safe(pkgbin.get_command() + ['--version'])[0:2] if p.returncode != 0: - mlog.warning('Found pkg-config {!r} but it failed when run' - ''.format(' '.join(pkgbin.get_command()))) + mlog.warning(f'Found pkg-config {command_as_string!r} but it failed when run') return None except FileNotFoundError: - mlog.warning('We thought we found pkg-config {!r} but now it\'s not there. How odd!' - ''.format(' '.join(pkgbin.get_command()))) + mlog.warning(f'We thought we found pkg-config {command_as_string!r} but now it\'s not there. How odd!') return None except PermissionError: - msg = 'Found pkg-config {!r} but didn\'t have permissions to run it.'.format(' '.join(pkgbin.get_command())) + msg = f'Found pkg-config {command_as_string!r} but didn\'t have permissions to run it.') if not self.env.machines.build.is_windows(): msg += '\n\nOn Unix-like systems this is often caused by scripts that are not executable.' mlog.warning(msg)