mirror of https://gitlab.com/ita1024/waf.git
Fix suspicious warnings
This commit is contained in:
parent
46fe4bc658
commit
2db0b41b28
|
@ -357,7 +357,7 @@ master_doc = 'index'
|
||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = u'Waf'
|
project = u'Waf'
|
||||||
copyright = u'2005-2022, Thomas Nagy'
|
copyright = u'2005-2023, Thomas Nagy'
|
||||||
|
|
||||||
# The version info for the project you're documenting, acts as replacement for
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
# |version| and |release|, also used in various other places throughout the
|
# |version| and |release|, also used in various other places throughout the
|
||||||
|
|
|
@ -111,7 +111,7 @@ def options(opt):
|
||||||
|
|
||||||
class MSVCVersion(object):
|
class MSVCVersion(object):
|
||||||
def __init__(self, ver):
|
def __init__(self, ver):
|
||||||
m = re.search('^(.*)\s+(\d+[.]\d+)', ver)
|
m = re.search(r'^(.*)\s+(\d+[.]\d+)', ver)
|
||||||
if m:
|
if m:
|
||||||
self.name = m.group(1)
|
self.name = m.group(1)
|
||||||
self.number = float(m.group(2))
|
self.number = float(m.group(2))
|
||||||
|
|
|
@ -169,7 +169,7 @@ class cpplint(Task.Task):
|
||||||
global critical_errors
|
global critical_errors
|
||||||
with cpplint_wrapper(get_cpplint_logger(self.env.CPPLINT_OUTPUT), self.env.CPPLINT_BREAK, self.env.CPPLINT_OUTPUT):
|
with cpplint_wrapper(get_cpplint_logger(self.env.CPPLINT_OUTPUT), self.env.CPPLINT_BREAK, self.env.CPPLINT_OUTPUT):
|
||||||
params = {key: str(self.env[key]) for key in self.env if 'CPPLINT_' in key}
|
params = {key: str(self.env[key]) for key in self.env if 'CPPLINT_' in key}
|
||||||
if params['CPPLINT_OUTPUT'] is 'waf':
|
if params['CPPLINT_OUTPUT'] == 'waf':
|
||||||
params['CPPLINT_OUTPUT'] = 'emacs'
|
params['CPPLINT_OUTPUT'] = 'emacs'
|
||||||
params['CPPLINT'] = self.env.get_flat('CPPLINT')
|
params['CPPLINT'] = self.env.get_flat('CPPLINT')
|
||||||
cmd = Utils.subst_vars(CPPLINT_STR, params)
|
cmd = Utils.subst_vars(CPPLINT_STR, params)
|
||||||
|
|
Loading…
Reference in New Issue