]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Fix the RaiseError variable issue caused by 855698fb69f
authorYonghong Zhu <yonghong.zhu@intel.com>
Wed, 5 Sep 2018 03:26:15 +0000 (11:26 +0800)
committerYonghong Zhu <yonghong.zhu@intel.com>
Wed, 12 Sep 2018 05:20:46 +0000 (13:20 +0800)
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.chen@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Hess Chen <hesheng.chen@intel.com>
BaseTools/Source/Python/Common/EdkLogger.py

index 80697bf09b2e92240245f36d1f1f3fc2d71f2244..af7707482ccb7d897bb8a7d3b18094196fb45aa3 100644 (file)
@@ -198,8 +198,8 @@ def error(ToolName, ErrorCode, Message=None, File=None, Line=None, ExtraData=Non
         LogText = _ErrorMessageTemplateWithoutFile % TemplateDict\r
 \r
     _ErrorLogger.log(ERROR, LogText)\r
-    RaiseError = IsRaiseError\r
-    if RaiseError:\r
+\r
+    if RaiseError and IsRaiseError:\r
         raise FatalError(ErrorCode)\r
 \r
 # Log information which should be always put out\r