From: Leif Lindholm <leif.lindholm@linaro.org>
To: BobCF <bob.c.feng@intel.com>
Cc: edk2-devel@lists.01.org, Liming Gao <liming.gao@intel.com>
Subject: Re: [Patch V3] BaseTools: Fixed bugs in CopyDict function
Date: Tue, 11 Dec 2018 09:36:12 +0000 [thread overview]
Message-ID: <20181211093612.hogxlhhw3ol63ssz@bivouac.eciton.net> (raw)
In-Reply-To: <20181211090325.2340-1-bob.c.feng@intel.com>
Hi Bob,
Thanks for cc.
I'm happy with all 3 commit messages.
Regards,
Leif
On Tue, Dec 11, 2018 at 05:03:25PM +0800, BobCF wrote:
> From: "Feng, Bob C" <bob.c.feng@intel.com>
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1387
>
> This patch is going to fix the regression issue which is
> introduced by commit bf9e636605188e291d33ab694ff1c5926b6f0800.
>
> This patch Remove the CopyDict incorrect usage for non-dict
> input data. Add a check for CopyDict input.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> BaseTools/Source/Python/Common/Misc.py | 2 ++
> BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
> index b063f064fb..6a22d01012 100644
> --- a/BaseTools/Source/Python/Common/Misc.py
> +++ b/BaseTools/Source/Python/Common/Misc.py
> @@ -2137,10 +2137,12 @@ def PackByteFormatGUID(Guid):
> #
> # @retval new dict or orderdict
> #
> def CopyDict(ori_dict):
> dict_type = ori_dict.__class__
> + if dict_type not in (dict,OrderedDict):
> + return ori_dict
> new_dict = dict_type()
> for key in ori_dict:
> if isinstance(ori_dict[key],(dict,OrderedDict)):
> new_dict[key] = CopyDict(ori_dict[key])
> else:
> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
> index b485c75a84..4543ae7dc0 100644
> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> @@ -972,11 +972,11 @@ class DscBuildData(PlatformBuildClassObject):
> for skuid in pcd.SkuInfoList:
> skuobj = pcd.SkuInfoList.get(skuid)
> if TAB_DEFAULT_STORES_DEFAULT not in skuobj.DefaultStoreDict:
> PcdDefaultStoreSet = set(defaultstorename for defaultstorename in skuobj.DefaultStoreDict)
> mindefaultstorename = DefaultStoreMgr.GetMin(PcdDefaultStoreSet)
> - skuobj.DefaultStoreDict[TAB_DEFAULT_STORES_DEFAULT] = CopyDict(skuobj.DefaultStoreDict[mindefaultstorename])
> + skuobj.DefaultStoreDict[TAB_DEFAULT_STORES_DEFAULT] = skuobj.DefaultStoreDict[mindefaultstorename]
> return Pcds
>
> def RecoverCommandLinePcd(self):
> def UpdateCommandLineValue(pcd):
> if pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],
> @@ -2767,11 +2767,11 @@ class DscBuildData(PlatformBuildClassObject):
> for skuid in PcdObj.SkuInfoList:
> skuobj = PcdObj.SkuInfoList[skuid]
> mindefaultstorename = DefaultStoreObj.GetMin(set(defaultstorename for defaultstorename in skuobj.DefaultStoreDict))
> for defaultstorename in DefaultStores:
> if defaultstorename not in skuobj.DefaultStoreDict:
> - skuobj.DefaultStoreDict[defaultstorename] = CopyDict(skuobj.DefaultStoreDict[mindefaultstorename])
> + skuobj.DefaultStoreDict[defaultstorename] = skuobj.DefaultStoreDict[mindefaultstorename]
> skuobj.HiiDefaultValue = skuobj.DefaultStoreDict[mindefaultstorename]
> for skuname, skuid in SkuIds.items():
> if skuname not in PcdObj.SkuInfoList:
> nextskuid = self.SkuIdMgr.GetNextSkuId(skuname)
> while nextskuid not in PcdObj.SkuInfoList:
> --
> 2.19.1.windows.1
>
next prev parent reply other threads:[~2018-12-11 9:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 9:03 [Patch V3] BaseTools: Fixed bugs in CopyDict function BobCF
2018-12-11 9:36 ` Leif Lindholm [this message]
2018-12-11 13:43 ` Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181211093612.hogxlhhw3ol63ssz@bivouac.eciton.net \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox