Sync BaseTools Trunk (version r2518) to EDKII main trunk.

Signed-off-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13178 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py

@@ -96,7 +96,10 @@ class Table(object):
     #
     def Drop(self):
         SqlCommand = """drop table IF EXISTS %s""" % self.Table
-        self.Cur.execute(SqlCommand)
+        try:
+            self.Cur.execute(SqlCommand)
+        except sqlite3.Error, e:
+            print "An error occurred when Drop a table:", e.args[0]
 
     ## Get count
     #

BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py

@@ -1162,8 +1162,9 @@ class DscParser(MetaFileParser):
             self._IdMapping[Id] = self._LastItem
 
         RecordList = self._Table.GetAll()
-        self._Table.Drop()
+        
         self._RawTable.Drop()
+        self._Table.Drop()
         for Record in RecordList:
             EccGlobalData.gDb.TblDsc.Insert(Record[1],Record[2],Record[3],Record[4],Record[5],Record[6],Record[7],Record[8],Record[9],Record[10],Record[11],Record[12],Record[13],Record[14])
         GlobalData.gPlatformDefines.update(self._FileLocalMacros)