From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=67.231.154.164; helo=dispatch1-us1.ppe-hosted.com; envelope-from=tpilar@solarflare.com; receiver=edk2-devel@lists.01.org Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 740C02117D75A for ; Mon, 29 Oct 2018 09:52:59 -0700 (PDT) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 3F1C8B4007C for ; Mon, 29 Oct 2018 16:52:58 +0000 (UTC) Received: from tp-desktop.uk.solarflarecom.com (10.17.20.51) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 29 Oct 2018 09:52:55 -0700 From: "Tomas Pilar (tpilar)" To: "edk2-devel@lists.01.org" Message-ID: <60f2b2ac-292f-cf6a-dbcb-afccb32ce1ed@solarflare.com> Date: Mon, 29 Oct 2018 16:52:53 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 X-Originating-IP: [10.17.20.51] X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24186.005 X-TM-AS-Result: No-2.789300-4.000000-10 X-TMASE-MatchedRID: AoIuaCp/2W8vebl6MJ1oUQPZZctd3P4Bm/y00tE9StZ0cpXNtrVD/cUK 5y8IwIRF89vzz8epxNSDWlsWfTiUCo9oUcx9VMLgOX/V8P8ail2S8v5OLj2NysRB0bsfrpPInxM yeYT53Rn/bcf1cupHrVkKq/yz07u2ek4zVMU9T9IRTmsjjpGlDDRVgV79XkLX7BdcICgvVsJPud 9jCSUaD4/uk3gKArbshUYZgEcj/+zW7TWbOh+TWJGYTqi6gneM3ZcrA+o+FYYFWG1G7q8GC1Zca 9RSYo/b X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--2.789300-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24186.005 X-MDID: 1540831978-5Yk3nPfWN3-y Subject: [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: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 X-List-Received-Date: Mon, 29 Oct 2018 16:52:59 -0000 Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit 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.CurrentLineNumber) # Get a list of PCI IDs Overrides.PciDeviceId = "" - while (self.__GetNextHexNumber()): - Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self.__Token) + while (self._GetNextHexNumber()): + Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self._Token) if not Overrides.PciDeviceId: raise Warning.Expected("one or more Hex device ids", self.FileName, self.CurrentLineNumber) continue -- 2.17.2