BaseTools/Ecc: Fix two bugs for the checkpoint of GUID

a) Fix a bug of displaying wrong format of a GUID
b) Fix a bug of setting wrong exception keyword

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: YangX Li <yangx.li@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17710 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py
index 6c4c90ca782115fdcefc14cbee1728fe15778b3e..7932fb3394a9e1553f55854964d1caf47911ce93 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Check.py
+++ b/BaseTools/Source/Python/Ecc/Check.py
@@ -1116,7 +1116,7 @@ class Check(object):
                      """ % (Table.Table, Table.Table, Model, Model)\r
         RecordSet = Table.Exec(SqlCommand)\r
         for Record in RecordSet:     \r
-            if not EccGlobalData.gException.IsException(ErrorID, Record[1] + ':' + Record[2]):\r
+            if not EccGlobalData.gException.IsException(ErrorID, Record[2]):\r
                 EccGlobalData.gDb.TblReport.Insert(ErrorID, OtherMsg="The %s value [%s] is used more than one time" % (Name.upper(), Record[2]), BelongsToTable=Table.Table, BelongsToItem=Record[0])\r
 \r
     # Naming Convention Check\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 734912f0f1e7857937f745515f58df1667932541..123d694939ecbc7f6bd28feec37760060019f8c8 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -1709,7 +1709,8 @@ class DecParser(MetaFileParser):
                     continue\r
                 else:\r
                     if GuidValue.startswith('{'):\r
-                        HexList.append('0x' + str(GuidValue[3:]))\r
+                        GuidValue = GuidValue.lstrip(' {')\r
+                        HexList.append('0x' + str(GuidValue[2:]))\r
                         Index += 1\r
             self._ValueList[1] = "{ %s, %s, %s, { %s, %s, %s, %s, %s, %s, %s, %s }}" % (HexList[0], HexList[1], HexList[2],HexList[3],HexList[4],HexList[5],HexList[6],HexList[7],HexList[8],HexList[9],HexList[10])\r
         else:\r