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.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 15778211A1E3D for ; Tue, 1 Jan 2019 17:39:51 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jan 2019 17:39:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,429,1539673200"; d="scan'208";a="122640402" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jan 2019 17:39:50 -0800 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 1 Jan 2019 17:39:50 -0800 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 1 Jan 2019 17:39:50 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.45]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.239]) with mapi id 14.03.0415.000; Wed, 2 Jan 2019 09:39:48 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fixed build report issue. Thread-Index: AQHUn1LIn0k0Aj0yak6TbvScWEZNEaWbOWzQ Date: Wed, 2 Jan 2019 01:39:47 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E39FB91@SHSMSX104.ccr.corp.intel.com> References: <20181229084446.23308-1-bob.c.feng@intel.com> In-Reply-To: <20181229084446.23308-1-bob.c.feng@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] BaseTools: Fixed build report issue. 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: Wed, 02 Jan 2019 01:39:52 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao -----Original Message----- >From: Feng, Bob C >Sent: Saturday, December 29, 2018 4:45 PM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch] BaseTools: Fixed build report issue. > >From: "Feng, Bob C" > >This patch is going to fix the regression issue >by 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5 > >After enable PCD array, the Pcd.OverrideStruct has a new >key, array index, but the build report is not changed correspondingly. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/build/BuildReport.py | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > >diff --git a/BaseTools/Source/Python/build/BuildReport.py >b/BaseTools/Source/Python/build/BuildReport.py >index d379866618..3f3c1a12f1 100644 >--- a/BaseTools/Source/Python/build/BuildReport.py >+++ b/BaseTools/Source/Python/build/BuildReport.py >@@ -1422,13 +1422,14 @@ class PcdReport(object): > self.PrintPcdDefault(File, Pcd, IsStructure, DscMatch= , >DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue) > > def OverrideFieldValue(self, Pcd, OverrideStruct): > OverrideFieldStruct =3D collections.OrderedDict() > if OverrideStruct: >- for Key, Values in OverrideStruct.items(): >- if Values[1] and Values[1].endswith('.dsc'): >- OverrideFieldStruct[Key] =3D Values >+ for _, Values in OverrideStruct.items(): >+ for Key,value in Values.items(): >+ if value[1] and value[1].endswith('.dsc'): >+ OverrideFieldStruct[Key] =3D value > if Pcd.PcdFieldValueFromFdf: > for Key, Values in Pcd.PcdFieldValueFromFdf.items(): > if Key in OverrideFieldStruct and Values[0] =3D=3D >OverrideFieldStruct[Key][0]: > continue > OverrideFieldStruct[Key] =3D Values >-- >2.19.1.windows.1