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/modules/windows.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/modules/windows.py')
| -rw-r--r-- | mesonbuild/modules/windows.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index e8d266e..87a83fe 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -59,7 +59,7 @@ class WindowsModule(ExtensionModule): if not rescomp.found(): raise MesonException('Could not find Windows resource compiler') - for (arg, match, type) in [ + for (arg, match, rc_type) in [ ('/?', '^.*Microsoft.*Resource Compiler.*$', ResourceCompilerType.rc), ('--version', '^.*GNU windres.*$', ResourceCompilerType.windres), ]: @@ -67,7 +67,7 @@ class WindowsModule(ExtensionModule): m = re.search(match, o, re.MULTILINE) if m: mlog.log('Windows resource compiler: %s' % m.group()) - self._rescomp = (rescomp, type) + self._rescomp = (rescomp, rc_type) break else: raise MesonException('Could not determine type of Windows resource compiler') |