Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consistent kwarg popping.

This commit is contained in:
Jussi Pakkanen 2016-08-21 15:04:44 +03:00
parent 4b3414cba0
commit fae8ad90a4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/modules/gnome.py
View File

@ -61,7 +61,7 @@ class GnomeModule:
cmd += ['--c-name', kwargs.pop('c_name')] cmd += ['--c-name', kwargs.pop('c_name')]
cmd += ['--generate', '--target', '@OUTPUT@'] cmd += ['--generate', '--target', '@OUTPUT@']
cmd += mesonlib.stringlistify(kwargs.get('extra_args', [])) cmd += mesonlib.stringlistify(kwargs.pop('extra_args', []))
kwargs['command'] = cmd kwargs['command'] = cmd
kwargs['input'] = args[1] kwargs['input'] = args[1]
@ -118,9 +118,7 @@ class GnomeModule:
scan_command += ['--no-libtool', '--namespace='+ns, '--nsversion=' + nsversion, '--warn-all', scan_command += ['--no-libtool', '--namespace='+ns, '--nsversion=' + nsversion, '--warn-all',
'--output', '@OUTPUT@'] '--output', '@OUTPUT@']
extra_args = kwargs.pop('extra_args', []) extra_args = mesonlib.stringlistify(kwargs.pop('extra_args', []))
if not isinstance(extra_args, list):
extra_args = [extra_args]
scan_command += extra_args scan_command += extra_args
for incdirs in girtarget.include_dirs: for incdirs in girtarget.include_dirs: