diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 15:04:44 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-21 15:04:44 +0300 |
| commit | fae8ad90a45e61caaec7e74c510ac092dc347098 (patch) | |
| tree | 8a4f45455cbe635f91d951264d9cce13637071aa | |
| parent | 4b3414cba0345a4d9b915ba81cf42c54e0a54fbe (diff) | |
| download | meson-fae8ad90a45e61caaec7e74c510ac092dc347098.zip meson-fae8ad90a45e61caaec7e74c510ac092dc347098.tar.gz meson-fae8ad90a45e61caaec7e74c510ac092dc347098.tar.bz2 | |
Consistent kwarg popping.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index de202d8..f451cce 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -61,7 +61,7 @@ class GnomeModule: cmd += ['--c-name', kwargs.pop('c_name')] cmd += ['--generate', '--target', '@OUTPUT@'] - cmd += mesonlib.stringlistify(kwargs.get('extra_args', [])) + cmd += mesonlib.stringlistify(kwargs.pop('extra_args', [])) kwargs['command'] = cmd kwargs['input'] = args[1] @@ -118,9 +118,7 @@ class GnomeModule: scan_command += ['--no-libtool', '--namespace='+ns, '--nsversion=' + nsversion, '--warn-all', '--output', '@OUTPUT@'] - extra_args = kwargs.pop('extra_args', []) - if not isinstance(extra_args, list): - extra_args = [extra_args] + extra_args = mesonlib.stringlistify(kwargs.pop('extra_args', [])) scan_command += extra_args for incdirs in girtarget.include_dirs: |