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.115; helo=mga14.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 E98652117D741 for ; Mon, 29 Oct 2018 17:38:59 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Oct 2018 17:38:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,442,1534834800"; d="scan'208";a="103616131" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 29 Oct 2018 17:38:59 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 29 Oct 2018 17:38:59 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 29 Oct 2018 17:38:58 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.199]) with mapi id 14.03.0415.000; Tue, 30 Oct 2018 08:38:57 +0800 From: "Zhu, Yonghong" To: "Tomas Pilar (tpilar)" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH v2] BaseTools: Fix merge in FDF parser for OptionROM override Thread-Index: AQHUb6kTj25f6aTtZUyclyrQar2X0qU28nEQ Date: Tue, 30 Oct 2018 00:38:57 +0000 Message-ID: References: <60f2b2ac-292f-cf6a-dbcb-afccb32ce1ed@solarflare.com> In-Reply-To: <60f2b2ac-292f-cf6a-dbcb-afccb32ce1ed@solarflare.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 v2] BaseTools: Fix merge in FDF parser for OptionROM override 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: Tue, 30 Oct 2018 00:39:00 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks for the update. Reviewed-by: Yonghong Zhu =20 Best Regards, Zhu Yonghong -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Toma= s Pilar (tpilar) Sent: Tuesday, October 30, 2018 12:53 AM To: edk2-devel@lists.01.org Subject: [edk2] [PATCH v2] BaseTools: Fix merge in FDF parser for OptionROM= override Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Tomas Pilar --- BaseTools/Source/Python/GenFds/FdfParser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index 1c9a5130bf..44cc8f63d0 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -4396,8 +4396,8 @@ class FdfParser: raise Warning.ExpectedEquals(self.FileName, self.C= urrentLineNumber) # Get a list of PCI IDs Overrides.PciDeviceId =3D "" - while (self.__GetNextHexNumber()): - Overrides.PciDeviceId =3D "{} {}".format(Overrides= .PciDeviceId, self.__Token) + while (self._GetNextHexNumber()): + Overrides.PciDeviceId =3D "{} {}".format(Overrides= .PciDeviceId, self._Token) if not Overrides.PciDeviceId: raise Warning.Expected("one or more Hex device ids= ", self.FileName, self.CurrentLineNumber) continue --=20 2.17.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel