diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-07-22 00:55:02 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-07-25 21:56:11 -0700 |
| commit | 1e1dee738b7eae9e9c22601522798f4945391379 (patch) | |
| tree | f67cecc0c4ec97ca009374ebe2644c7a8adc685e | |
| parent | d285be763f193606b078f218fdedc58679dfe037 (diff) | |
| download | meson-1e1dee738b7eae9e9c22601522798f4945391379.zip meson-1e1dee738b7eae9e9c22601522798f4945391379.tar.gz meson-1e1dee738b7eae9e9c22601522798f4945391379.tar.bz2 | |
qt module: correctly compare program name for lrelease version
(b, name) will always have the canonical tool name, not just a
potentially weird bin path. We need to check stderr for qt4 tools other
than lrelease, but we keyed off of the tool bin path, so matches were by
no means guaranteed, and specifically, would fail if the tool is looked
up via bindir.
This really should always have checked the canonical name, which is
guaranteed to be correct.
Partial fix for #10443
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 49374d4..6a223a8 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -154,7 +154,7 @@ class QtBaseModule(ExtensionModule): # Ensure that the version of qt and each tool are the same def get_version(p: ExternalProgram) -> str: _, out, err = Popen_safe(p.get_command() + arg) - if b.startswith('lrelease') or not qt_dep.version.startswith('4'): + if name == 'lrelease' or not qt_dep.version.startswith('4'): care = out else: care = err |