Sync BaseTool trunk (version r2599) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Parser / InfLibrarySectionParser.py

diff --git a/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py
index 8f9427cf4fa8c74dba1225efc8bbb1661139dc94..4540fe2754dba12451c609f3c2252477f9a3c00f 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfLibrarySectionParser.py
@@ -170,28 +170,29 @@ class InfLibrarySectionParser(InfParserSectionRoot):
                             File=FileName, \r
                             Line=LineNo, \r
                             ExtraData=LineContent)\r
-            \r
+\r
             if IsLibInstanceInfo(LineContent):\r
                 LibInsFlag = True\r
                 continue\r
-            \r
+\r
             if LibInsFlag:\r
-                LibGuid, LibVer = GetLibInstanceInfo(LineContent, GlobalData.gWORKSPACE, LineNo)\r
+                LibGuid, LibVer = GetLibInstanceInfo(LineContent, GlobalData.gWORKSPACE, LineNo, FileName)\r
                 #\r
                 # If the VERSION_STRING is missing from the INF file, tool should default to "0".\r
                 #\r
                 if LibVer == '':\r
                     LibVer = '0'\r
                 if LibGuid != '':\r
-                    LibraryList.append((LibGuid, LibVer))\r
+                    if (LibGuid, LibVer) not in LibraryList:\r
+                        LibraryList.append((LibGuid, LibVer))\r
                 else:\r
-                    Logger.Error('InfParser', \r
+                    Logger.Error('InfParser',\r
                             FORMAT_INVALID,\r
-                            ST.ERR_LIB_INSTANCE_MISS_GUID, \r
-                            File=FileName, \r
-                            Line=LineNo, \r
-                            ExtraData=LineContent)                    \r
-                \r
+                            ST.ERR_LIB_INSTANCE_MISS_GUID,\r
+                            File=FileName,\r
+                            Line=LineNo,\r
+                            ExtraData=LineContent)\r
+\r
         #\r
         # Current section archs\r
         #    \r