[PATCH] BaseTools: Correct the SkuOverwrite.

[PATCH] BaseTools: Correct the SkuOverwrite.

[Zhaozh1x]

StructurePcd, SkuA does not define any structure pcd overwrite,
But SkuA inherit from DEFAULT sku, and DEFAULT sku define
structure pcd overwrite, the pcd value of SkuA should same with
DEFAULT sku.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: ZhiqiangX Zhao <zhiqiangx.zhao@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Workspace/DscBuildData.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index aaef404772..5321101def 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1838,12 +1838,15 @@ class DscBuildData(PlatformBuildClassObject):
                     IsArray = IsFieldValueAnArray(FieldList[FieldName][0])
                     if IsArray:
                         try:
-                            FieldList[FieldName][0] = ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)
+                            FieldValue = 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:
-                        Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])
+                        if IsArray:
+                            Value, ValueSize = ParseFieldValue (FieldValue)
+                        else:
+                            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

Re: [PATCH] BaseTools: Correct the SkuOverwrite.

[Gao, Liming]

Zhiqiang:
  Please update patch title with more information to describe the correct behavior. 

>-----Original Message-----
>From: Zhao, ZhiqiangX
>Sent: Wednesday, September 12, 2018 11:25 AM
>To: edk2-devel@lists.01.org
>Cc: Zhao, ZhiqiangX <zhiqiangx.zhao@intel.com>; Gao, Liming
><liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Feng,
>Bob C <bob.c.feng@intel.com>
>Subject: [PATCH] BaseTools: Correct the SkuOverwrite.
>
>StructurePcd, SkuA does not define any structure pcd overwrite,
>But SkuA inherit from DEFAULT sku, and DEFAULT sku define
>structure pcd overwrite, the pcd value of SkuA should same with
>DEFAULT sku.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: ZhiqiangX Zhao <zhiqiangx.zhao@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Yonghong Zhu <yonghong.zhu@intel.com>
>Cc: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/Workspace/DscBuildData.py | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>b/BaseTools/Source/Python/Workspace/DscBuildData.py
>index aaef404772..5321101def 100644
>--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>@@ -1838,12 +1838,15 @@ class DscBuildData(PlatformBuildClassObject):
>                     IsArray = IsFieldValueAnArray(FieldList[FieldName][0])
>                     if IsArray:
>                         try:
>-                            FieldList[FieldName][0] =
>ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)
>+                            FieldValue = 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:
>-                        Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])
>+                        if IsArray:
>+                            Value, ValueSize = ParseFieldValue (FieldValue)
>+                        else:
>+                            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