BaseTools:Add extra debugging message

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2014

Add extra debugging to improve error identification.
Error while processing file if the file is read incorrectly

This patch is going to fix that issue.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index 2e4671a433..eed30388be 100644
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -526,12 +526,16 @@ def SearchString(UniObjectClass, FileList, IsCompatibleMode):
         return UniObjectClass

 

     for File in FileList:

-        if os.path.isfile(File):

-            Lines = open(File, 'r')

-            for Line in Lines:

-                for StrName in STRING_TOKEN.findall(Line):

-                    EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName)

-                    UniObjectClass.SetStringReferenced(StrName)

+        try:

+            if os.path.isfile(File):

+                Lines = open(File, 'r')

+                for Line in Lines:

+                    for StrName in STRING_TOKEN.findall(Line):

+                        EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName)

+                        UniObjectClass.SetStringReferenced(StrName)

+        except:

+            EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, "SearchString: Error while processing file", File=File, RaiseError=False)

+            raise

 

     UniObjectClass.ReToken()