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

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Xml / XmlParser.py

diff --git a/BaseTools/Source/Python/UPT/Xml/XmlParser.py b/BaseTools/Source/Python/UPT/Xml/XmlParser.py
index adfeca81a000328412ca8b5aa2949d3d56b807bd..5a2f0dc70571603a22f019ab975bd08e8c5c3030 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/XmlParser.py
+++ b/BaseTools/Source/Python/UPT/Xml/XmlParser.py
@@ -180,7 +180,9 @@ class DistributionPackageXml(object):
             for Item in XmlList(self.Pkg, '/DistributionPackage/ModuleSurfaceArea'):\r
                 Msa = ModuleSurfaceAreaXml()\r
                 Module = Msa.FromXml(Item, 'ModuleSurfaceArea', True)\r
-                self.DistP.ModuleSurfaceArea[(Module.GetGuid(), Module.GetVersion(), Module.GetModulePath())] = Module\r
+                ModuleKey = (Module.GetGuid(), Module.GetVersion(), Module.GetName(), Module.GetModulePath())\r
+                self.DistP.ModuleSurfaceArea[ModuleKey] = Module\r
+\r
             #    \r
             # Parse Tools\r
             #\r