From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 2600621196815 for ; Mon, 10 Dec 2018 06:37:03 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2018 06:37:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,338,1539673200"; d="scan'208";a="99531105" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga006.jf.intel.com with ESMTP; 10 Dec 2018 06:37:02 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 10 Dec 2018 06:37:02 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 10 Dec 2018 06:37:02 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.203]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.176]) with mapi id 14.03.0415.000; Mon, 10 Dec 2018 22:37:00 +0800 From: "Gao, Liming" To: Leif Lindholm , "Feng, Bob C" CC: "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch V2] BaseTools: Fixed the build fail issue for cases Thread-Index: AQHUkCYTt440GgWGZkqBtHKwFac5TqV3YcgAgACo74A= Date: Mon, 10 Dec 2018 14:36:59 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3898BC@SHSMSX104.ccr.corp.intel.com> References: <20181210011658.5212-1-bob.c.feng@intel.com> <20181210123012.cswf2pbzppqxff27@bivouac.eciton.net> In-Reply-To: <20181210123012.cswf2pbzppqxff27@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzE1NjRkOWEtY2U5Zi00MjExLWJhMjEtN2VhMWQ1YjgwZDAwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoickppdkZPOStWUCtDU1wvZFFxd0YxVFpUT0ZOUlhwZXFTK0VPUUlKV0dmQldNVCtHREk1VHo2VUduV1NpaW5aZHIifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch V2] BaseTools: Fixed the build fail issue for cases 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, 10 Dec 2018 14:37:04 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Leif: So, you don't think to need highlight which commit causes the regression = issue in the commit message. I suggest to put this information into BZ desc= ription instead of commit message.=20 Thanks Liming > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Le= if Lindholm > Sent: Monday, December 10, 2018 8:30 PM > To: Feng, Bob C > Cc: edk2-devel@lists.01.org; Gao, Liming > Subject: Re: [edk2] [Patch V2] BaseTools: Fixed the build fail issue for = cases >=20 > Hi Bob, >=20 > On Mon, Dec 10, 2018 at 09:16:58AM +0800, BobCF wrote: > > From: "Feng, Bob C" > > > > V2: >=20 > Patch version information does not belong in the commit message. > It belongs in a cover letter, or if a cover letter is not used, you > can put these details below the --- line. This way it gets filtered > out by git. >=20 > The patch commit message should end up being a description of what the > patch is and does, not the development process that got us there. >=20 > Regards, >=20 > Leif >=20 > > update the commit log. This issue is introduced by > > the commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5 > > > > V1: > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1386 > > 1. There is no Pcd value assignment in Dsc file > > 2. There are duplicate Pcd filed assignment > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Bob Feng > > Cc: Liming Gao > > --- > > BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- > > BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/Ba= seTools/Source/Python/Workspace/BuildClassObject.py > > index 008eee1a16..d02232b546 100644 > > --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py > > +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py > > @@ -289,11 +289,11 @@ class StructurePcd(PcdClassObject): > > if DefaultStoreName not in self.SkuOverrideValues[SkuName]: > > self.SkuOverrideValues[SkuName][DefaultStoreName] =3D Orde= redDict() > > if DimensionAttr not in self.SkuOverrideValues[SkuName][Defaul= tStoreName]: > > self.SkuOverrideValues[SkuName][DefaultStoreName][Dimensio= nAttr] =3D collections.OrderedDict() > > if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreNa= me][DimensionAttr]: > > - del self.SkuOverrideValues[SkuName][DefaultStoreName][Fiel= dName][DimensionAttr] > > + del self.SkuOverrideValues[SkuName][DefaultStoreName][Dime= nsionAttr][FieldName] > > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAtt= r][FieldName] =3D [Value.strip(), FileName, LineNo] > > return self.SkuOverrideValues[SkuName][DefaultStoreName][Dimen= sionAttr][FieldName] > > > > def SetPcdMode (self, PcdMode): > > self.PcdMode =3D PcdMode > > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/Base= Tools/Source/Python/Workspace/MetaFileParser.py > > index 4bd52619a9..eaedba0c12 100644 > > --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py > > +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py > > @@ -1201,11 +1201,11 @@ class DscParser(MetaFileParser): > > else: > > self._ValueList =3D None > > return > > TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VALUE_S= PLIT, 1) > > self._CurrentPcdName =3D TokenList[0] > > - if TokenList[1].strip().startswith("{CODE"): > > + if len(TokenList) =3D=3D 2 and TokenList[1].strip().startswith= ("{CODE"): > > self._PcdDataTypeCODE =3D True > > self._PcdCodeValue =3D TokenList[1].strip() > > > > if self._PcdDataTypeCODE: > > if self._CurrentLine.endswith(")}"): > > -- > > 2.19.1.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