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 C401F2117D75A for ; Mon, 29 Oct 2018 09:53:27 -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 54E37B4005B for ; Mon, 29 Oct 2018 16:53:26 +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:53:23 -0700 To: References: <18d8624d-b68c-c1f1-2ab3-3b10fc1b999c@solarflare.com> From: "Tomas Pilar (tpilar)" Message-ID: Date: Mon, 29 Oct 2018 16:53:21 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <18d8624d-b68c-c1f1-2ab3-3b10fc1b999c@solarflare.com> 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-3.559300-4.000000-10 X-TMASE-MatchedRID: fgYTp5XatxYOwH4pD14DsPHkpkyUphL90vNkFv6xUCMNmPMcsvd5FlO4 BD7nLMxnlTJXKqh1ne1je0H8c4EFqa3HdLR9eiXxy7TSWcbz49aEQiKo28GuYxZIRcYzTqqlo8W MkQWv6iUD0yuKrQIMCD3Al4zalJpFWBd6ltyXuvu3WoaenasHWcTJIXdRNzAeySmU3G66YpsB6I SVCx7r20oOME0Mb1MimsxK99BCXiu+PMuq+EzsUsRGkR9BDVDXkeNGbbpFaKfiyknYNNG4UsJ5C XR354NjYgAclNVPicMiFlSxve+1hr4wzarEPwFlftwZ3X11IV0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.559300-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24186.005 X-MDID: 1540832006-O4voOG5k5iz5 Subject: Re: [PATCH] BaseTools: Fix typo 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:53:28 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Language: en-US Turns out this is a merge conflict. Respinning. On 29/10/2018 16:40, Tomas Pilar (tpilar) wrote: > Cc: Yonghong Zhu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Tomas Pilar > --- > BaseTools/Source/Python/GenFds/FdfParser.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py > index 1c9a5130bf..71cce8f61e 100644 > --- a/BaseTools/Source/Python/GenFds/FdfParser.py > +++ b/BaseTools/Source/Python/GenFds/FdfParser.py > @@ -4396,7 +4396,7 @@ class FdfParser: > raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber) > # Get a list of PCI IDs > Overrides.PciDeviceId = "" > - while (self.__GetNextHexNumber()): > + 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)