Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

[mirror_edk2.git] / BaseTools / Source / Python / UPT / InstallPkg.py

diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py
index c258222d6dac2990d4965e20a9e40680c2ccd29d..1c75dad80b1684cb5072fc3fe47affef61eaa0fb 100644 (file)
--- a/BaseTools/Source/Python/UPT/InstallPkg.py
+++ b/BaseTools/Source/Python/UPT/InstallPkg.py
@@ -265,11 +265,11 @@ def GetModuleList(DistPkg, Dep, WorkspaceDir, ContentZipFile, ModuleList):
     #\r
     Module = None\r
     NewDict = Sdict()        \r
-    for Guid, Version, Path in DistPkg.ModuleSurfaceArea:\r
+    for Guid, Version, Name, Path in DistPkg.ModuleSurfaceArea:\r
         ModulePath = Path\r
-        Module = DistPkg.ModuleSurfaceArea[Guid, Version, Path]\r
+        Module = DistPkg.ModuleSurfaceArea[Guid, Version, Name, Path]\r
         Logger.Info(ST.MSG_INSTALL_MODULE % Module.GetName())\r
-        if Dep.CheckModuleExists(Guid, Version):\r
+        if Dep.CheckModuleExists(Guid, Version, Name, Path):\r
             Logger.Quiet(ST.WRN_MODULE_EXISTED %Path)\r
         #\r
         # here check for the multiple inf share the same module path cases:\r
@@ -291,7 +291,7 @@ def GetModuleList(DistPkg, Dep, WorkspaceDir, ContentZipFile, ModuleList):
         #\r
         Module.SetModulePath(Module.GetModulePath().replace(Path, NewModulePath, 1))\r
         \r
-        NewDict[Guid, Version, Module.GetModulePath()] = Module\r
+        NewDict[Guid, Version, Name, Module.GetModulePath()] = Module\r
 \r
     #\r
     # generate all inf for modules\r
@@ -737,8 +737,8 @@ def InstallPackageContent(FromPath, ToPath, Package, ContentZipFile, Dep,
     #\r
     Module = None\r
     ModuleDict = Package.GetModuleDict()\r
-    for ModuleGuid, ModuleVersion, ModulePath in ModuleDict:\r
-        Module = ModuleDict[ModuleGuid, ModuleVersion, ModulePath]\r
+    for ModuleGuid, ModuleVersion, ModuleName, ModulePath in ModuleDict:\r
+        Module = ModuleDict[ModuleGuid, ModuleVersion, ModuleName, ModulePath]\r
         InstallModuleContent(FromPath, ToPath, ModulePath, Module,\r
             ContentZipFile, WorkspaceDir, ModuleList, Package, ReadOnly)\r
 \r