From e84d2b709b82d2cbcb2b5b0fe2a58858af2ac01b Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Thu, 25 Jun 2015 08:08:55 +0000 Subject: 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 Reviewed-by: YangX Li git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17710 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/Python/Ecc/Check.py | 2 +- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py index 6c4c90ca78..7932fb3394 100644 --- 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) RecordSet = Table.Exec(SqlCommand) for Record in RecordSet: - if not EccGlobalData.gException.IsException(ErrorID, Record[1] + ':' + Record[2]): + if not EccGlobalData.gException.IsException(ErrorID, Record[2]): 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]) # Naming Convention Check diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index 734912f0f1..123d694939 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -1709,7 +1709,8 @@ class DecParser(MetaFileParser): continue else: if GuidValue.startswith('{'): - HexList.append('0x' + str(GuidValue[3:])) + GuidValue = GuidValue.lstrip(' {') + HexList.append('0x' + str(GuidValue[2:])) Index += 1 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]) else: -- cgit v1.2.3