X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FEot%2FEotMain.py;h=791fcdfeaed8059ee7ebd4add209b7468fe29ffe;hb=2e351cbe8e190271b3716284fc1076551d005472;hp=56aa48d2a1145f6038c42c618c4a5085344f9aec;hpb=c196d1d129ad7567f578e155c18e71ae62f9b2ad;p=mirror_edk2.git

diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index 56aa48d2a1..791fcdfeae 100644
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -2,13 +2,7 @@
 # This file is used to be the main entrance of EOT tool
 #
 # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 ##
@@ -391,7 +385,7 @@ class FirmwareVolume(Image):
         FfsDxeCoreGuid = None
         FfsPeiPrioriGuid = None
         FfsDxePrioriGuid = None
-        for FfsID in self.UnDispatchedFfsDict.keys():
+        for FfsID in list(self.UnDispatchedFfsDict.keys()):
             Ffs = self.UnDispatchedFfsDict[FfsID]
             if Ffs.Type == 0x03:
                 FfsSecCoreGuid = FfsID
@@ -497,7 +491,7 @@ class FirmwareVolume(Image):
     def DisPatchDxe(self, Db):
         IsInstalled = False
         ScheduleList = sdict()
-        for FfsID in self.UnDispatchedFfsDict.keys():
+        for FfsID in list(self.UnDispatchedFfsDict.keys()):
             CouldBeLoaded = False
             DepexString = ''
             FileDepex = None
@@ -562,7 +556,7 @@ class FirmwareVolume(Image):
 
     def DisPatchPei(self, Db):
         IsInstalled = False
-        for FfsID in self.UnDispatchedFfsDict.keys():
+        for FfsID in list(self.UnDispatchedFfsDict.keys()):
             CouldBeLoaded = True
             DepexString = ''
             FileDepex = None
@@ -1105,7 +1099,7 @@ class MultipleFv(FirmwareVolume):
             Fv.frombuffer(Buf, 0, len(Buf))
 
             self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size])
-            self.FfsDict.append(Fv.FfsDict)
+            self.FfsDict.update(Fv.FfsDict)
 
 ## Class Eot
 #
@@ -1597,7 +1591,7 @@ class Eot(object):
             if not InfFile:
                 continue
             EdkLogger.quiet("Parsing %s ..."  % str(InfFile))
-            EdkInfParser(InfFile, EotGlobalData.gDb, Inf_Files[InfFile], '')
+            EdkInfParser(InfFile, EotGlobalData.gDb, Inf_Files[InfFile])
 
         EotGlobalData.gDb.Conn.commit()
         EdkLogger.quiet("Building database for meta data files done!")