From e8727fc8571bc8b9dc23255c267b52478d12e66f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 8 Sep 2022 10:30:39 -0700 Subject: pylint: enable implicit-str-concat Which catches a very real bug. The zlib system dependency failed to work on MSVC since initial implementation in commit c1a3b37ab7e4ccf3a946ee4ba6da81a4c230ecc4 -- it looked for the wrong name. --- .pylintrc | 1 - mesonbuild/dependencies/dev.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pylintrc b/.pylintrc index 59cdc5e..6245958 100644 --- a/.pylintrc +++ b/.pylintrc @@ -20,7 +20,6 @@ disable= duplicate-value, exec-used, fixme, - implicit-str-concat, import-error, import-outside-toplevel, inconsistent-mro, diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index b345387..0c4690b 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -500,7 +500,7 @@ class ZlibSystemDependency(SystemDependency): self.link_args = ['-lz'] else: if self.clib_compiler.get_argument_syntax() == 'msvc': - libs = ['zlib1' 'zlib'] + libs = ['zlib1', 'zlib'] else: libs = ['z'] for lib in libs: -- cgit v1.1