Reviewed-by: Bob Feng <bob.c.f...@intel.com>
-----Original Message-----
From: Zhao, ZhiqiangX
Sent: Monday, October 22, 2018 3:06 PM
To: edk2-devel@lists.01.org
Cc: Zhao, ZhiqiangX <zhiqiangx.z...@intel.com>; Gao, Liming
<liming....@intel.com>; Zhu, Yonghong <yonghong....@intel.com>; Feng, Bob C
<bob.c.f...@intel.com>
Subject: [PATCH] BaseTools:Translate the StructurePCD value in field to correct
format.
For StructurePCD value got from DSC file, translate its field value in to
correct format in report.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: ZhiqiangX Zhao <zhiqiangx.z...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Yonghong Zhu <yonghong....@intel.com>
Cc: Bob Feng <bob.c.f...@intel.com>
---
BaseTools/Source/Python/Workspace/DscBuildData.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 17e6f62cac..9b1be3ec59 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1925,15 +1925,12 @@ class DscBuildData(PlatformBuildClassObject):
IsArray = IsFieldValueAnArray(FieldList[FieldName][0])
if IsArray:
try:
- FieldValue =
ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)
+ FieldList[FieldName][0] =
+ ValueExpressionEx(FieldList[FieldName][0], TAB_VOID,
+ self._GuidDict)(True)
except BadExpression:
EdkLogger.error('Build', FORMAT_INVALID, "Invalid
value format for %s. From %s Line %d " %
(".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)),
FieldList[FieldName][1], FieldList[FieldName][2]))
try:
- if IsArray:
- Value, ValueSize = ParseFieldValue (FieldValue)
- else:
- Value, ValueSize = ParseFieldValue
(FieldList[FieldName][0])
+ Value, ValueSize = ParseFieldValue
+ (FieldList[FieldName][0])
except Exception:
EdkLogger.error('Build', FORMAT_INVALID, "Invalid
value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,
Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))
if isinstance(Value, str):
--
2.14.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
