Reviewed-by: Hess Chen <hesheng.c...@intel.com> Chen, Hess Intel China Software Center Tel: +86-21-6116-6740 Email: hesheng.c...@intel.com
-----Original Message----- From: Zhu, Yonghong Sent: Wednesday, September 5, 2018 11:27 AM To: edk2-devel@lists.01.org Cc: Chen, Hesheng <hesheng.c...@intel.com>; Gao, Liming <liming....@intel.com> Subject: [Patch] BaseTools: Fix the RaiseError variable issue caused by 855698fb69f The bug is that it cause the RaiseError always be set to TRUE even we call the function with FALSE parameter. Cc: Hess Chen <hesheng.c...@intel.com> Cc: Liming Gao <liming....@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong....@intel.com> --- BaseTools/Source/Python/Common/EdkLogger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Common/EdkLogger.py b/BaseTools/Source/Python/Common/EdkLogger.py index 80697bf..af77074 100644 --- a/BaseTools/Source/Python/Common/EdkLogger.py +++ b/BaseTools/Source/Python/Common/EdkLogger.py @@ -196,12 +196,12 @@ def error(ToolName, ErrorCode, Message=None, File=None, Line=None, ExtraData=Non LogText = _ErrorMessageTemplate % TemplateDict else: LogText = _ErrorMessageTemplateWithoutFile % TemplateDict _ErrorLogger.log(ERROR, LogText) - RaiseError = IsRaiseError - if RaiseError: + + if RaiseError and IsRaiseError: raise FatalError(ErrorCode) # Log information which should be always put out quiet = _ErrorLogger.error -- 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel