* [PATCH] BaseTools: Fix typo in FDF parser for OptionROM override
@ 2018-10-29 16:40 Tomas Pilar (tpilar)
2018-10-29 16:53 ` Tomas Pilar (tpilar)
0 siblings, 1 reply; 2+ messages in thread
From: Tomas Pilar (tpilar) @ 2018-10-29 16:40 UTC (permalink / raw)
To: edk2-devel@lists.01.org
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Tomas Pilar <tpilar@solarflare.com>
---
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)
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] BaseTools: Fix typo in FDF parser for OptionROM override
2018-10-29 16:40 [PATCH] BaseTools: Fix typo in FDF parser for OptionROM override Tomas Pilar (tpilar)
@ 2018-10-29 16:53 ` Tomas Pilar (tpilar)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Pilar (tpilar) @ 2018-10-29 16:53 UTC (permalink / raw)
To: edk2-devel
Turns out this is a merge conflict. Respinning.
On 29/10/2018 16:40, Tomas Pilar (tpilar) wrote:
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Tomas Pilar <tpilar@solarflare.com>
> ---
> 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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-29 16:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-29 16:40 [PATCH] BaseTools: Fix typo in FDF parser for OptionROM override Tomas Pilar (tpilar)
2018-10-29 16:53 ` Tomas Pilar (tpilar)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox