From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 110AA21164EFA for ; Mon, 15 Oct 2018 00:18:00 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2018 00:18:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,383,1534834800"; d="scan'208";a="99462737" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga001.jf.intel.com with ESMTP; 15 Oct 2018 00:17:57 -0700 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 15 Oct 2018 00:17:57 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 15 Oct 2018 00:17:57 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.48]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.245]) with mapi id 14.03.0319.002; Mon, 15 Oct 2018 15:17:33 +0800 From: "Gao, Liming" To: "Zhao, ZhiqiangX" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH V2] BaseTools: Code should not update the variable that save the raw data. Thread-Index: AdRUn1+NpvIOkyH2SMCATQWq4SsIfQPt6LoQ Date: Mon, 15 Oct 2018 07:17:33 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E33A088@SHSMSX104.ccr.corp.intel.com> References: <3EDA9EC575A99E4E8A20D2F1972405306F83FBB7@SHSMSX101.ccr.corp.intel.com> In-Reply-To: <3EDA9EC575A99E4E8A20D2F1972405306F83FBB7@SHSMSX101.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V2] BaseTools: Code should not update the variable that save the raw data. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2018 07:18:01 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Zhiqiang: The patch is good to me. Reviewed-by: Liming Gao =20 But, please remember to send patch mail, not attach the patch for review= .=20 Thanks Liming >-----Original Message----- >From: Zhao, ZhiqiangX >Sent: Tuesday, September 25, 2018 3:16 PM >To: Gao, Liming ; edk2-devel@lists.01.org >Cc: Zhu, Yonghong ; Feng, Bob C >; Zhao, ZhiqiangX >Subject: [PATCH V2] BaseTools: Code should not update the variable that sa= ve >the raw data. > >Hi Liming, > >I have update the patch title with more information, please check the >attached patch file. > >Best Regards, >Zhiqiang Zhao > > >-----Original Message----- >From: Gao, Liming >Sent: Tuesday, September 25, 2018 9:05 AM >To: Zhao, ZhiqiangX ; edk2-devel@lists.01.org >Cc: Zhu, Yonghong ; Feng, Bob C > >Subject: RE: [PATCH] BaseTools: Correct the SkuOverwrite. > >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 ; Gao, Liming >>; Zhu, Yonghong ; Feng, >>Bob C >>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 >>Cc: Liming Gao >>Cc: Yonghong Zhu >>Cc: Bob Feng >>--- >> 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 =3D IsFieldValueAnArray(FieldList[FieldName]= [0]) >> if IsArray: >> try: >>- FieldList[FieldName][0] =3D >>ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, >>self._GuidDict)(True) >>+ FieldValue =3D >>+ 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 =3D ParseFieldValue (FieldList[= FieldName][0]) >>+ if IsArray: >>+ Value, ValueSize =3D ParseFieldValue (FieldV= alue) >>+ else: >>+ Value, ValueSize =3D 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