From nobody Mon May 6 11:26:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44797+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44797+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564665832; cv=none; d=zoho.com; s=zohoarc; b=IJfS7SHoma7TDWVSk/VFs8Z5J5ozJVaEiOB326rNXy2c1qTmKJcDLPn01EWZvEsLvTRyLg5x7POJ7CjKMzB9F+4FmT0g+6PQFwj3iRwkFvtAZVxFZ7uQRdDUpLhR9r+haGDplOS82ns9nzC6/1SbsJn+7ykGC0ZfISFOfEDUF+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564665832; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=UIin82xKjJNavSytziFPYvOZNy4FsSsq4FogOf35sl0=; b=g6VCAaHCHbww5HuWhhMIytaow3d1Ubm1OBHfNM+SqNc53AY1NWJXNV6yelJsUe5UEXQhLW+MLb+FivW83r4Eu493OSpinaPW50MzH84479UUWFvLWMLCRHDsDWWrTXdBhzvnxthGKNZXTUGZizEWSd20/ERXt4tcDRycIAV9jWk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44797+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564665832376207.89864926596977; Thu, 1 Aug 2019 06:23:52 -0700 (PDT) Return-Path: X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Thu, 01 Aug 2019 06:23:51 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 06:23:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,334,1559545200"; d="scan'208";a="324235561" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.47]) by orsmga004.jf.intel.com with ESMTP; 01 Aug 2019 06:23:49 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Bob Feng Subject: [edk2-devel] [Patch] BaseTools: Fixed a typo in Trim.py Date: Thu, 1 Aug 2019 21:23:43 +0800 Message-Id: <20190801132343.10628-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564665831; bh=E4y7G68ce8YszPPWOLR+MzoPGU3Z+KE4V6T5e8lfEpA=; h=Cc:Date:From:Reply-To:Subject:To; b=TFla+JQKnSOcy4/tWxD9MTedpiu3F6RxwXOY5vQTgCYq0M9ApAvYkiqos/u8aMoHf2Z Vx/HRBefnVWxOKSsjSNeEBHB9OcAr2C/NOIlwpPR2oqwjVBzSysmG/m/gN+uRACBCa26i Bxnzr96ES4xkKPzOdSFHBT6SilrY67h3ZRQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This is a regression issue introduced by commit 307e1650be267b67db7be1089e0979ace460d83 This patch is to fix this issue. Cc: Liming Gao Signed-off-by: Bob Feng Reviewed-by: Jaben Carsey Reviewed-by: Liming Gao Reviewed-by: Philippe Mathieu-Daude --- BaseTools/Source/Python/Trim/Trim.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, Tr= imLong): 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: Erro= r while processing file", File=3DSource) =20 PreprocessedFile =3D "" InjectedFile =3D "" LineIndexOfOriginalFile =3D None --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44797): https://edk2.groups.io/g/devel/message/44797 Mute This Topic: https://groups.io/mt/32678944/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-