X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FUPT%2FCore%2FDistributionPackageClass.py;h=8ac8d4ed5255253ef9415f0a6cc99ba74646bb9a;hp=03872379518eb26c5b38ad7e9e8259a3703c84f8;hb=d0acc87a41d9aa25fe87eb096efa62afacd1f865;hpb=b7891584a58d5e5e26f35c0944cae5f03efd880b

diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
index 0387237951..8ac8d4ed52 100644
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -95,7 +95,7 @@ class DistributionPackageClass(object):
         #
         self.PackageSurfaceArea = Sdict() 
         #
-        # {(Guid, Version, Path) : ModuleObj}
+        # {(Guid, Version, Name, Path) : ModuleObj}
         #
         self.ModuleSurfaceArea = Sdict()  
         self.Tools = MiscFileObject()
@@ -149,6 +149,7 @@ class DistributionPackageClass(object):
                         ModuleDict = PackageObj.GetModuleDict()
                         ModuleDict[(ModuleObj.GetGuid(), \
                                     ModuleObj.GetVersion(), \
+                                    ModuleObj.GetName(), \
                                     ModuleObj.GetCombinePath())] = ModuleObj
                         PackageObj.SetModuleDict(ModuleDict)
                     except FatalError, ErrCode:
@@ -172,10 +173,11 @@ class DistributionPackageClass(object):
                 try:
                     ModuleObj = InfPomAlignment(ModuleFileFullPath, 
                                                 WorkspaceDir)
-                    self.ModuleSurfaceArea[(ModuleObj.GetGuid(), \
-                                            ModuleObj.GetVersion(), \
-                                            ModuleObj.GetCombinePath())] = \
-                                            ModuleObj
+                    ModuleKey = (ModuleObj.GetGuid(), 
+                                 ModuleObj.GetVersion(), 
+                                 ModuleObj.GetName(), 
+                                 ModuleObj.GetCombinePath())
+                    self.ModuleSurfaceArea[ModuleKey] = ModuleObj
                 except FatalError, ErrCode:
                     if ErrCode.message == EDK1_INF_ERROR:
                         Logger.Error("UPT",
@@ -207,16 +209,16 @@ class DistributionPackageClass(object):
         
             Module = None
             ModuleDict = Package.GetModuleDict()
-            for Guid, Version, Path in ModuleDict:
-                Module = ModuleDict[Guid, Version, Path]
+            for Guid, Version, Name, Path in ModuleDict:
+                Module = ModuleDict[Guid, Version, Name, Path]
                 ModulePath = Module.GetModulePath()
                 FullPath = Module.GetFullPath()
                 PkgRelPath = os.path.normpath(os.path.join(PackagePath, ModulePath))
                 MetaDataFileList.append(Path)
                 self.FileList += GetNonMetaDataFiles(os.path.dirname(FullPath), ['CVS', '.svn'], False, PkgRelPath)
      
-        for Guid, Version, Path in self.ModuleSurfaceArea:
-            Module = self.ModuleSurfaceArea[Guid, Version, Path]
+        for Guid, Version, Name, Path in self.ModuleSurfaceArea:
+            Module = self.ModuleSurfaceArea[Guid, Version, Name, Path]
             ModulePath = Module.GetModulePath()
             FullPath = Module.GetFullPath()
             MetaDataFileList.append(Path)