diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-02 23:30:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 23:30:29 +0300 |
| commit | 1f4023fa47803458700e52352dec51f3f85fa6c1 (patch) | |
| tree | e4b2790ff92404ad6f939832922770b9a359908e /mesonbuild/interpreter.py | |
| parent | 06bfc2dab61c5bf79265a8db777b02732ee86ecf (diff) | |
| parent | 74b535fea74843c83944e9f22d40e6259ca105b8 (diff) | |
| download | meson-1f4023fa47803458700e52352dec51f3f85fa6c1.zip meson-1f4023fa47803458700e52352dec51f3f85fa6c1.tar.gz meson-1f4023fa47803458700e52352dec51f3f85fa6c1.tar.bz2 | |
Merge pull request #5311 from mensinda/flake8Plugins
Added flake8 plugins and some code fixes
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index a3505a4..9d1a27d 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2193,7 +2193,7 @@ class Interpreter(InterpreterBase): def check_cross_stdlibs(self): if self.build.environment.is_cross_build(): props = self.build.environment.properties.host - for l, c in self.build.cross_compilers.items(): + for l in self.build.cross_compilers.keys(): try: di = mesonlib.stringlistify(props.get_stdlib(l)) if len(di) != 2: @@ -2454,7 +2454,7 @@ external dependencies (including libraries) must go to "dependencies".''') with mlog.nested(): # Suppress the 'ERROR:' prefix because this exception is not # fatal and VS CI treat any logs with "ERROR:" as fatal. - mlog.exception(e, prefix=None) + mlog.exception(e, prefix=mlog.yellow('Exception:')) mlog.log('\nSubproject', mlog.bold(dirname), 'is buildable:', mlog.red('NO'), '(disabling)') return self.disabled_subproject(dirname) raise e |