SF.net SVN: edk2-buildtools:[2492] trunk/BaseTools/Source/Python/GenFds/ FdfParser.py

[<yi...@us...>]

Revision: 2492
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2492&view=rev
Author:   yingke
Date:     2012-02-29 03:21:54 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Fix bug for incorrect line number printed when check duplicated INFs in a FV section.
Signed-off-by: yingke
Reviewed-by: lgao4
Reviewed-by: jsu1

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/GenFds/FdfParser.py

Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2012-02-27 23:44:20 UTC (rev 2491)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2012-02-29 03:21:54 UTC (rev 2492)
@@ -2302,6 +2302,10 @@
         if not self.__GetNextToken():
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)
         ffsInf.InfFileName = self.__Token
+
+        ffsInf.CurrentLineNum = self.CurrentLineNumber
+        ffsInf.CurrentLineContent = self.__CurrentLine()
+
         if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:
             #do case sensitive check for file path
             ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
@@ -2321,9 +2325,6 @@
             else:
                 raise Warning("Unknown reloc strip flag '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)
         
-        ffsInf.CurrentLineNum = self.CurrentLineNumber
-        ffsInf.CurrentLineContent = self.__CurrentLine()
-        
         if ForCapsule:
             capsuleFfs = CapsuleData.CapsuleFfs()
             capsuleFfs.Ffs = ffsInf
@@ -2434,9 +2435,6 @@
                 
         FfsFileObj.NameGuid = self.__Token
         
-        FfsFileObj.CurrentLineNum = self.CurrentLineNumber
-        FfsFileObj.CurrentLineContent = self.__CurrentLine()
-        
         self.__GetFilePart( FfsFileObj, MacroDict.copy())
 
         if ForCapsule:
@@ -2526,6 +2524,8 @@
             self.__UndoToken()
             self.__GetSectionData( FfsFileObj, MacroDict)
         else:
+            FfsFileObj.CurrentLineNum = self.CurrentLineNumber
+            FfsFileObj.CurrentLineContent = self.__CurrentLine()
             FfsFileObj.FileName = self.__Token
             if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:
                 #

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.