diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-12-09 15:26:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 15:26:06 +0200 |
| commit | 2ec3fe7a4af5bd4d8a83947d675f9233805f3dfd (patch) | |
| tree | 57c5fa9c668d8488042a6b71282c1035996cce0e /mesonbuild/modules | |
| parent | 7b2c47eb45e7a5b4787e89a6b6f98a8753868d1a (diff) | |
| parent | 09cbc53f57f63709c952333fe7d7950926dff7b7 (diff) | |
| download | meson-2ec3fe7a4af5bd4d8a83947d675f9233805f3dfd.zip meson-2ec3fe7a4af5bd4d8a83947d675f9233805f3dfd.tar.gz meson-2ec3fe7a4af5bd4d8a83947d675f9233805f3dfd.tar.bz2 | |
Merge pull request #10990 from xclaesse/devenv
devenv: various improvements
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 1d5e746..d0d7dbf 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -39,7 +39,7 @@ from ..interpreterbase.decorators import typed_pos_args from ..mesonlib import ( MachineChoice, MesonException, OrderedSet, Popen_safe, join_args, ) -from ..programs import OverrideProgram, EmptyExternalProgram +from ..programs import OverrideProgram from ..scripts.gettext import read_linguas if T.TYPE_CHECKING: @@ -1464,9 +1464,8 @@ class GnomeModule(ExtensionModule): t_args.append(f'--{program_name}={path}') if namespace: t_args.append('--namespace=' + namespace) - # if not need_exe_wrapper, we get an EmptyExternalProgram. If none provided, we get NoneType exe_wrapper = state.environment.get_exe_wrapper() - if not isinstance(exe_wrapper, (NoneType, EmptyExternalProgram)): + if exe_wrapper: t_args.append('--run=' + ' '.join(exe_wrapper.get_command())) t_args.append(f'--htmlargs={"@@".join(kwargs["html_args"])}') t_args.append(f'--scanargs={"@@".join(kwargs["scan_args"])}') |