Fixed a code bug.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/Python/Workspace/DscBuildData.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 804eafa619..e8b36a3868 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1293,14 +1293,14 @@ class DscBuildData(PlatformBuildClassObject):
     def OverrideByFdfOverAll(self,AllPcds):
 
         if GlobalData.gFdfParser is None:
             return AllPcds
         NoFiledValues = GlobalData.gFdfParser.Profile.PcdDict
-        for Guid,Name,Field in NoFiledValues:
+        for Name,Guid,Field in NoFiledValues:
             if len(Field):
                 continue
-            Value = NoFiledValues[(Guid,Name,Field)]
+            Value = NoFiledValues[(Name,Guid,Field)]
             if (Name,Guid) in AllPcds:
                 Pcd = AllPcds.get((Name,Guid))
                 if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), None),StructurePcd):
                     self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName)).PcdValueFromComm = Value
                 else:
@@ -1323,11 +1323,11 @@ class DscBuildData(PlatformBuildClassObject):
                             MaxSize = max(CurrentSize, OptionSize)
                             Pcd.MaxDatumSize = str(MaxSize)
             else:
                 PcdInDec = self.DecPcds.get((Name,Guid))
                 if PcdInDec:
-                    PcdInDec.PcdValueFromComm = Value
+                    PcdInDec.PcdValueFromFdf = Value
                     if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],
                                         self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],
                                         self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]:
                         self.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)
                         self.Pcds[Name, Guid].DefaultValue = Value
-- 
2.16.2.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

This patch fixes the regression issues caused by 543f5ac30facfbb40eafb2b4908649a427784080. 
Without this fix, OvmfPkg will build failure. 

Thanks
Liming
>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>BobCF
>Sent: Monday, July 16, 2018 5:39 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [edk2] [Patch] BaseTools: Fixed build Ovmfpkg failed issue.
>
>Fixed a code bug.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>---
> BaseTools/Source/Python/Workspace/DscBuildData.py | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>b/BaseTools/Source/Python/Workspace/DscBuildData.py
>index 804eafa619..e8b36a3868 100644
>--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>@@ -1293,14 +1293,14 @@ class DscBuildData(PlatformBuildClassObject):
>     def OverrideByFdfOverAll(self,AllPcds):
>
>         if GlobalData.gFdfParser is None:
>             return AllPcds
>         NoFiledValues = GlobalData.gFdfParser.Profile.PcdDict
>-        for Guid,Name,Field in NoFiledValues:
>+        for Name,Guid,Field in NoFiledValues:
>             if len(Field):
>                 continue
>-            Value = NoFiledValues[(Guid,Name,Field)]
>+            Value = NoFiledValues[(Name,Guid,Field)]
>             if (Name,Guid) in AllPcds:
>                 Pcd = AllPcds.get((Name,Guid))
>                 if
>isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName),
>None),StructurePcd):
>
>self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName)).PcdValu
>eFromComm = Value
>                 else:
>@@ -1323,11 +1323,11 @@ class DscBuildData(PlatformBuildClassObject):
>                             MaxSize = max(CurrentSize, OptionSize)
>                             Pcd.MaxDatumSize = str(MaxSize)
>             else:
>                 PcdInDec = self.DecPcds.get((Name,Guid))
>                 if PcdInDec:
>-                    PcdInDec.PcdValueFromComm = Value
>+                    PcdInDec.PcdValueFromFdf = Value
>                     if PcdInDec.Type in
>[self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],
>
>self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],
>
>self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]:
>                         self.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)
>                         self.Pcds[Name, Guid].DefaultValue = Value
>--
>2.16.2.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel