diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-03 01:34:15 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-04 12:54:31 +0300 |
| commit | d335a84b9e91bb03bb99a296a5ecf084b325e6ce (patch) | |
| tree | 4de98a9b8b7ca289d2217ee81408af7e3f1ed55a | |
| parent | 6d939c67370e2fc3f4d4607864ed4addbef22cb7 (diff) | |
| download | meson-d335a84b9e91bb03bb99a296a5ecf084b325e6ce.tar.gz | |
A few more lgtm fixes.
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index a8fc8a353..a933f0e6a 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -175,7 +175,6 @@ class IntelCPPCompiler(IntelCompiler, CPPCompiler): class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): def __init__(self, exelist, version, is_cross, exe_wrap, is_64): self.language = 'cpp' - CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap) VisualStudioCCompiler.__init__(self, exelist, version, is_cross, exe_wrap, is_64) self.base_options = ['b_pch'] # FIXME add lto, pgo and the like diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index f88c265fd..16bf9acd6 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2049,6 +2049,7 @@ class Interpreter(InterpreterBase): # we won't actually read all the build files. return fallback_dep if not dep: + assert(exception is not None) raise exception # Only store found-deps in the cache diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 1630d95f0..6bf8b7f73 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -984,7 +984,7 @@ class GnomeModule(ExtensionModule): cmd += ['--prefix', value] elif arg == 'extra_args': if new_genmarshal: - cmd += mesonlib.stringlistify(value, []) + cmd += mesonlib.stringlistify(value) else: mlog.warning('The current version of GLib does not support extra arguments \n' 'for glib-genmarshal. You need at least GLib 2.53.3. See ', |