Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set

["Gao, Liming" <liming.gao@intel.com>]

Marvin:
  I don't see the whitespace in this patch. I also run BaseTools\Scripts\PatchCheck.py. There is no issue found. 

> -----Original Message-----
> From: Marvin Häuser [mailto:Marvin.Haeuser@outlook.com]
> Sent: Tuesday, May 22, 2018 7:52 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
> Subject: RE: [PATCH v2] BaseTools/Workspace: Fix ValueChain set
> 
> This is odd. I generated another patch and checked for whitespace and CRLF/LF changes and found everything to be fine.
> Now V2 has the exact same whitespace change as V1. Also, if I see it right, it failed to CC Yonghong even though the CMD clearly
> shows the cc.
> 
> Is there maybe some git expert around who has an idea what the issue could be?
> 
> Thanks,
> Marvin
> 
> > -----Original Message-----
> > From: edk2-devel <edk2-devel-bounces@lists.01.org> On Behalf Of Marvin
> > Häuser
> > Sent: Tuesday, May 22, 2018 1:48 PM
> > To: edk2-devel@lists.01.org
> > Cc: liming.gao@intel.com
> > Subject: [edk2] [PATCH v2] BaseTools/Workspace: Fix ValueChain set
> >
> > Commit 88252a90d1ca7846731cd2e4e8e860454f7d97a3 changed ValueChain
> > from a dict to a set, but also changed the (former) key type from a touple to
> > two separate values, which was probably unintended and also breaks build
> > for packages involving Structured PCDs, because add() only takes one
> > argument.
> > This commit changes the values back to touples.
> >
> > V2:
> >   - Removed a whitespace change.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
> > ---
> >  BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
> > b/BaseTools/Source/Python/Workspace/DscBuildData.py
> > index 8476543c5352..0262a91ed855 100644
> > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> > @@ -1347,7 +1347,7 @@ class DscBuildData(PlatformBuildClassObject):
> >                          nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)
> >                      stru_pcd.SkuOverrideValues[skuid] =
> > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault
> > else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for
> > defaultstorename in DefaultStores} if DefaultStores else
> > {TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValues})
> >                      if not NoDefault:
> > -                        stru_pcd.ValueChain.add(skuid,'')
> > +                        stru_pcd.ValueChain.add((skuid,''))
> >              if stru_pcd.Type in
> > [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],
> > self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:
> >                  for skuid in SkuIds:
> >                      nextskuid = skuid
> > @@ -1366,7 +1366,7 @@ class DscBuildData(PlatformBuildClassObject):
> >                      for defaultstoreid in DefaultStores:
> >                          if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:
> >                              stru_pcd.SkuOverrideValues[skuid][defaultstoreid] =
> > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorena
> > me])
> > -                            stru_pcd.ValueChain.add(skuid,defaultstoreid)
> > +
> > + stru_pcd.ValueChain.add((skuid,defaultstoreid))
> >          S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set)
> >          Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)
> >          if Str_Pcd_Values:
> > --
> > 2.17.0.windows.1
> >
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel