BaseTools: Fixed the build fail issue for cases

https://bugzilla.tianocore.org/show_bug.cgi?id=1386
This patch is going to fix the regression issue that is
introduced by commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5

The issue will happen in the following cases:
1. There is no Pcd value assignment in Dsc file
2. There are duplicate Pcd filed assignment

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 008eee1a1664b4ba1fe16318d34a638ab88ec70e..d02232b546e2722bace34c4f0fa07e2c147a8e78 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -291,7 +291,7 @@ class StructurePcd(PcdClassObject):
         if DimensionAttr not in self.SkuOverrideValues[SkuName][DefaultStoreName]:\r
             self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr] = collections.OrderedDict()\r
         if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr]:\r
-            del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName][DimensionAttr]\r
+            del self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName]\r
         self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName]\r
 \r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 4bd52619a9c5a86cb6b5499a57fb2dbe7b4d0be2..eaedba0c121e0b938faa8c084631101e1ad729a3 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1203,7 +1203,7 @@ class DscParser(MetaFileParser):
                 return\r
         TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)\r
         self._CurrentPcdName = TokenList[0]\r
-        if TokenList[1].strip().startswith("{CODE"):\r
+        if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"):\r
             self._PcdDataTypeCODE = True\r
             self._PcdCodeValue = TokenList[1].strip()\r
 \r