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>

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index 2e4671a4331d2f91f14f9b9fc20883590ac0b1a0..eed30388bea14146e7642a72107acd20a1b42f26 100644 (file)
--- 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\r
 \r
     for File in FileList:\r
-        if os.path.isfile(File):\r
-            Lines = open(File, 'r')\r
-            for Line in Lines:\r
-                for StrName in STRING_TOKEN.findall(Line):\r
-                    EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName)\r
-                    UniObjectClass.SetStringReferenced(StrName)\r
+        try:\r
+            if os.path.isfile(File):\r
+                Lines = open(File, 'r')\r
+                for Line in Lines:\r
+                    for StrName in STRING_TOKEN.findall(Line):\r
+                        EdkLogger.debug(EdkLogger.DEBUG_5, "Found string identifier: " + StrName)\r
+                        UniObjectClass.SetStringReferenced(StrName)\r
+        except:\r
+            EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, "SearchString: Error while processing file", File=File, RaiseError=False)\r
+            raise\r
 \r
     UniObjectClass.ReToken()\r
 \r

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index 43119bd7ff8cf4d210f03623ba9ed42efbfcc000..8767b67f7ee0113b4cf856f45142c5034dfc017b 100644 (file)
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -73,8 +73,10 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong):
     try:\r
         with open(Source, "r") as File:\r
             Lines = File.readlines()\r
-    except:\r
+    except IOError:\r
         EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=Source)\r
+    expect:\r
+        EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Error while processing file", File=Source)\r
 \r
     PreprocessedFile = ""\r
     InjectedFile = ""\r