2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Update TryAndPrint()

Browse source
This commit is contained in:
2Shirt 2021-04-21 23:57:19 -06:00
parent d200878e0d
commit c2d3752bc5
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/wk/std.py
View file

@ -569,13 +569,11 @@ class TryAndPrint():
verbose, verbose,
) )
f_exception = None f_exception = None
catch_all = catch_all if catch_all else self.catch_all
msg_good = msg_good if msg_good else self.msg_good msg_good = msg_good if msg_good else self.msg_good
output = None output = None
result_msg = 'UNKNOWN' result_msg = 'UNKNOWN'
if catch_all is None: verbose = verbose if verbose else self.verbose
catch_all = self.catch_all
if verbose is None:
verbose = self.verbose
# Build exception tuples # Build exception tuples
e_exceptions = tuple(self._get_exception(e) for e in self.list_errors) e_exceptions = tuple(self._get_exception(e) for e in self.list_errors)
@ -619,8 +617,8 @@ class TryAndPrint():
# Done # Done
self._log_result(message, result_msg) self._log_result(message, result_msg)
return { return {
'Failed': bool(f_exception),
'Exception': f_exception, 'Exception': f_exception,
'Failed': bool(f_exception),
'Output': output, 'Output': output,
} }