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.88; helo=mga01.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 4062421191720 for ; Tue, 11 Dec 2018 05:43:01 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2018 05:43:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,342,1539673200"; d="scan'208";a="106577240" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga007.fm.intel.com with ESMTP; 11 Dec 2018 05:43:00 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 11 Dec 2018 05:43:00 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.203]) by shsmsx102.ccr.corp.intel.com ([169.254.2.182]) with mapi id 14.03.0415.000; Tue, 11 Dec 2018 21:42:58 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch V3] BaseTools: Fixed the build fail issue for cases Thread-Index: AQHUkTCJ2zbYsoZIqkWrycIos0b0jqV5jHFQ Date: Tue, 11 Dec 2018 13:42:57 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E38A291@SHSMSX104.ccr.corp.intel.com> References: <20181211090346.2028-1-bob.c.feng@intel.com> In-Reply-To: <20181211090346.2028-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiY2MxYWNmMjEtMzQxMi00NzQ4LWE0OGUtZmJlYjI5YjE3MmYwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidTF3emxnNk16RGR5Q2d5K29FY1pYSkNzWFNSRzBXXC9GZVpUeURNb0JhOU9aTmp3Uk1EZmFwOG9ycUxhTURxU00ifQ== 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 V3] 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: Tue, 11 Dec 2018 13:43:01 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Bo= bCF > Sent: Tuesday, December 11, 2018 5:04 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [edk2] [Patch V3] BaseTools: Fixed the build fail issue for case= s >=20 > From: "Feng, Bob C" >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1386 > This patch is going to fix the regression issue that is > introduced by commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5 >=20 > The issue will happen in the following cases: > 1. There is no Pcd value assignment in Dsc file > 2. There are duplicate Pcd filed assignment >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Leif Lindholm > --- > BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- > BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/Base= Tools/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 Ordere= dDict() > if DimensionAttr not in self.SkuOverrideValues[SkuName][DefaultS= toreName]: > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionA= ttr] =3D collections.OrderedDict() > if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName= ][DimensionAttr]: > - del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldN= ame][DimensionAttr] > + del self.SkuOverrideValues[SkuName][DefaultStoreName][Dimens= ionAttr][FieldName] > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr]= [FieldName] =3D [Value.strip(), FileName, LineNo] > return self.SkuOverrideValues[SkuName][DefaultStoreName][Dimensi= onAttr][FieldName] >=20 > def SetPcdMode (self, PcdMode): > self.PcdMode =3D PcdMode > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTo= ols/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_SPL= IT, 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() >=20 > if self._PcdDataTypeCODE: > if self._CurrentLine.endswith(")}"): > -- > 2.19.1.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel