From: BobCF <bob.c.feng@intel.com>
Date: Mon, 16 Jul 2018 09:38:44 +0000 (+0800)
Subject: BaseTools: Fixed build Ovmfpkg failed issue.
X-Git-Tag: edk2-stable201903~1398
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=4c6d0de7bad46fc15fd34d394dffda3766e3a6a1

BaseTools: Fixed build Ovmfpkg failed issue.

Fixed the regression issues caused by 543f5ac30facfbb40eafb2b4908649a427784080

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

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
@@ -1295,10 +1295,10 @@ class DscBuildData(PlatformBuildClassObject):
         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):
@@ -1325,7 +1325,7 @@ class DscBuildData(PlatformBuildClassObject):
             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]]: