Revision: 17710
          http://sourceforge.net/p/edk2/code/17710
Author:   hchen30
Date:     2015-06-25 08:08:55 +0000 (Thu, 25 Jun 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: YangX Li <[email protected]>

Modified Paths:
--------------
    trunk/edk2/BaseTools/Source/Python/Ecc/Check.py
    trunk/edk2/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py

Modified: trunk/edk2/BaseTools/Source/Python/Ecc/Check.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/Ecc/Check.py     2015-06-25 08:05:42 UTC 
(rev 17709)
+++ trunk/edk2/BaseTools/Source/Python/Ecc/Check.py     2015-06-25 08:08:55 UTC 
(rev 17710)
@@ -1116,7 +1116,7 @@
                      """ % (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

Modified: 
trunk/edk2/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py  
2015-06-25 08:05:42 UTC (rev 17709)
+++ trunk/edk2/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py  
2015-06-25 08:08:55 UTC (rev 17710)
@@ -1709,7 +1709,8 @@
                     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:


------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors 
network devices and physical & virtual servers, alerts via email & sms 
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to