mirror of https://gitlab.com/ita1024/waf.git
Do not raise an exception on check_cfg/mandatory=False/-vv #2193
This commit is contained in:
parent
f09a1c56ca
commit
a97f6fb094
|
@ -358,13 +358,12 @@ def check_cfg(self, *k, **kw):
|
||||||
ret = None
|
ret = None
|
||||||
try:
|
try:
|
||||||
ret = self.exec_cfg(kw)
|
ret = self.exec_cfg(kw)
|
||||||
except self.errors.WafError:
|
except self.errors.WafError as e:
|
||||||
if 'errmsg' in kw:
|
if 'errmsg' in kw:
|
||||||
self.end_msg(kw['errmsg'], 'YELLOW', **kw)
|
self.end_msg(kw['errmsg'], 'YELLOW', **kw)
|
||||||
if Logs.verbose > 1:
|
if Logs.verbose > 1:
|
||||||
raise
|
self.to_log('Command failure: %s' % e)
|
||||||
else:
|
self.fatal('The configuration failed')
|
||||||
self.fatal('The configuration failed')
|
|
||||||
else:
|
else:
|
||||||
if not ret:
|
if not ret:
|
||||||
ret = True
|
ret = True
|
||||||
|
|
Loading…
Reference in New Issue