Turns out this is a merge conflict. Respinning. On 29/10/2018 16:40, Tomas Pilar (tpilar) wrote: > Cc: Yonghong Zhu <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Tomas Pilar <[email protected]> > --- > 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)
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
