From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: jaben.carsey@intel.com) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Thu, 01 Aug 2019 07:44:46 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 07:44:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,334,1559545200"; d="scan'208";a="180723146" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 01 Aug 2019 07:44:45 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.42]) by fmsmsx107.amr.corp.intel.com ([169.254.6.32]) with mapi id 14.03.0439.000; Thu, 1 Aug 2019 07:44:45 -0700 From: "Carsey, Jaben" To: "devel@edk2.groups.io" , "Feng, Bob C" CC: "Gao, Liming" Subject: Re: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py Thread-Topic: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py Thread-Index: AQHVSGxjgXiAKn1kiUaoS80gdgtoSabmXnIw Date: Thu, 1 Aug 2019 14:44:43 +0000 Message-ID: References: <20190801132343.10628-1-bob.c.feng@intel.com> In-Reply-To: <20190801132343.10628-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTc0N2I0MzMtY2E5YS00MzVlLWE0MjYtMmU2MWJjODQ2MDE2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibEw0M2ZSNXFFS09oclVcL0MrcFwvb05HNTRMTzY1S0prcHllcDdEUUhZeXVUQUd6RFQxM2hRa0RnNGhCRGhEcnY1In0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.1.200.108] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey Thanks -Jaben > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Bob Feng > Sent: Thursday, August 01, 2019 6:24 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Feng, Bob C > > Subject: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py >=20 > This is a regression issue introduced > by commit 307e1650be267b67db7be1089e0979ace460d83 >=20 > This patch is to fix this issue. >=20 > Cc: Liming Gao > Signed-off-by: Bob Feng > --- > BaseTools/Source/Python/Trim/Trim.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/Trim/Trim.py > b/BaseTools/Source/Python/Trim/Trim.py > index 8767b67f7e..24c3fafa76 100644 > --- a/BaseTools/Source/Python/Trim/Trim.py > +++ b/BaseTools/Source/Python/Trim/Trim.py > @@ -73,11 +73,11 @@ def TrimPreprocessedFile(Source, Target, > ConvertHex, TrimLong): > try: > with open(Source, "r") as File: > Lines =3D File.readlines() > except IOError: > EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DSource) > - expect: > + except: > EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: E= rror > while processing file", File=3DSource) >=20 > PreprocessedFile =3D "" > InjectedFile =3D "" > LineIndexOfOriginalFile =3D None > -- > 2.18.0.windows.1 >=20 >=20 >=20