From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=hesheng.chen@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C73E621959CB2 for ; Tue, 11 Sep 2018 21:26:42 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Sep 2018 21:26:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,363,1531810800"; d="scan'208";a="232140640" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga004.jf.intel.com with ESMTP; 11 Sep 2018 21:25:15 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 11 Sep 2018 21:24:56 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 11 Sep 2018 21:24:56 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.143]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.205]) with mapi id 14.03.0319.002; Wed, 12 Sep 2018 12:24:53 +0800 From: "Chen, Hesheng" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" CC: "Gao, Liming" Thread-Topic: [Patch] BaseTools: Fix the RaiseError variable issue caused by 855698fb69f Thread-Index: AQHURMhtemDF90ep+0GwMn73H+tQhqTsF3lQ Date: Wed, 12 Sep 2018 04:24:53 +0000 Message-ID: <3A06C110936C5348AEB96EBC072758C34279A8FA@SHSMSX104.ccr.corp.intel.com> References: <1536118049-20696-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1536118049-20696-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix the RaiseError variable issue caused by 855698fb69f X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2018 04:26:43 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Hess Chen Chen, Hess Intel China Software Center Tel: +86-21-6116-6740 Email: hesheng.chen@intel.com -----Original Message----- From: Zhu, Yonghong=20 Sent: Wednesday, September 5, 2018 11:27 AM To: edk2-devel@lists.01.org Cc: Chen, Hesheng ; Gao, Liming Subject: [Patch] BaseTools: Fix the RaiseError variable issue caused by 855= 698fb69f The bug is that it cause the RaiseError always be set to TRUE even we call = the function with FALSE parameter. Cc: Hess Chen Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu --- 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=3DNone, File= =3DNone, Line=3DNone, ExtraData=3DNon LogText =3D _ErrorMessageTemplate % TemplateDict else: LogText =3D _ErrorMessageTemplateWithoutFile % TemplateDict =20 _ErrorLogger.log(ERROR, LogText) - RaiseError =3D IsRaiseError - if RaiseError: + + if RaiseError and IsRaiseError: raise FatalError(ErrorCode) =20 # Log information which should be always put out quiet =3D _ErrorLogger.error =20 -- 2.6.1.windows.1