diff options
| author | Mike Sinkovsky <msink@permonline.ru> | 2017-01-17 14:42:55 +0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-18 21:22:47 +0200 |
| commit | 1d177fb1271b4198aa1ff652666a4244ec23a1c6 (patch) | |
| tree | 18a9c3918d9402771fd1f8cc1f695bf7ecb37510 | |
| parent | 22eed4c41729f1a8caed3ea366a05ec1bb72557c (diff) | |
| download | meson-1d177fb1271b4198aa1ff652666a4244ec23a1c6.zip meson-1d177fb1271b4198aa1ff652666a4244ec23a1c6.tar.gz meson-1d177fb1271b4198aa1ff652666a4244ec23a1c6.tar.bz2 | |
cleanup: Unused local variables
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies.py | 1 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 13 |
4 files changed, 6 insertions, 11 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 137e9ae..0cfbe90 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -224,7 +224,7 @@ class Vs2010Backend(backends.Backend): ofile.write('Microsoft Visual Studio Solution File, Format ' 'Version 11.00\n') ofile.write('# Visual Studio ' + self.vs_version + '\n') - prj_templ = prj_line = 'Project("{%s}") = "%s", "%s", "{%s}"\n' + prj_templ = 'Project("{%s}") = "%s", "%s", "{%s}"\n' for p in projlist: prj_line = prj_templ % (self.environment.coredata.guid, p[0], p[1], p[2]) diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index e77abb8..478722d 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -668,7 +668,6 @@ class BoostDependency(Dependency): self.lib_modules_mt[modname] = fname def detect_lib_modules_nix(self): - libsuffix = None if mesonlib.is_osx(): libsuffix = 'dylib' else: diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 720546f..7b10496 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -635,7 +635,6 @@ class Environment(): raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') def detect_d_compiler(self, want_cross): - exelist = None is_cross = False # Search for a D compiler. # We prefer LDC over GDC unless overridden with the DC diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 35adc59..bee635f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1338,7 +1338,7 @@ class Interpreter(InterpreterBase): projname, depname = di subproj = self.do_subproject(projname, {}) self.build.cross_stdlibs[l] = subproj.get_variable_method([depname], {}) - except KeyError as e: + except KeyError: pass @stringArgs @@ -1565,16 +1565,13 @@ class Interpreter(InterpreterBase): for defopt in self.default_project_options: key, value = defopt.split('=') pref = key + '=' - was_found = False for i in default_options: if i.startswith(pref): - was_found = True break - if was_found: - break - defopt = self.subproject + ':' + defopt - newoptions = [defopt] + self.environment.cmd_line_options.projectoptions - self.environment.cmd_line_options.projectoptions = newoptions + else: + defopt = self.subproject + ':' + defopt + newoptions = [defopt] + self.environment.cmd_line_options.projectoptions + self.environment.cmd_line_options.projectoptions = newoptions @stringArgs def func_project(self, node, args, kwargs): |