From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 E22E7821C3 for ; Wed, 22 Feb 2017 19:22:56 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 22 Feb 2017 19:22:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,197,1484035200"; d="scan'208";a="69102102" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga006.fm.intel.com with ESMTP; 22 Feb 2017 19:22:56 -0800 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 22 Feb 2017 19:22:56 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 22 Feb 2017 19:22:56 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX103.ccr.corp.intel.com ([10.239.4.69]) with mapi id 14.03.0248.002; Thu, 23 Feb 2017 11:22:54 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Fix the regression issue caused by commit dc4c77 Thread-Index: AQHSjSVD1PdJiqA0TEKfxZsdx8NmEaF17eRA Date: Thu, 23 Feb 2017 03:22:53 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D6E33DC@shsmsx102.ccr.corp.intel.com> References: <1487779395-10744-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1487779395-10744-1-git-send-email-yonghong.zhu@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: Fix the regression issue caused by commit dc4c77 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2017 03:22:57 -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 >Yonghong Zhu >Sent: Thursday, February 23, 2017 12:03 AM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [edk2] [Patch] BaseTools: Fix the regression issue caused by comm= it >dc4c77 > >In the last commit dc4c77, the _GetHeaderInfo will be called more than >once, which cause the self._ConstructorList.append(Value) append some >duplicate value. > >Cc: Liming Gao >Contributed-under: TianoCore Contribution Agreement 1.0 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/Workspace/WorkspaceDatabase.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py >b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py >index 0686721..c1af5c7 100644 >--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py >+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py >@@ -1828,12 +1828,10 @@ class InfBuildData(ModuleBuildClassObject): > self.__Macros =3D {} > # EDK_GLOBAL defined macros can be applied to EDK module > if self.AutoGenVersion < 0x00010005: > self.__Macros.update(GlobalData.gEdkGlobal) > self.__Macros.update(GlobalData.gGlobalDefines) >- else: >- self.__Macros.update(self.Defines) > return self.__Macros > > ## Get architecture > def _GetArch(self): > return self._Arch >@@ -1894,10 +1892,11 @@ class InfBuildData(ModuleBuildClassObject): > if Name in self: > self[Name] =3D Value > if self._Defs =3D=3D None: > self._Defs =3D sdict() > self._Defs[Name] =3D Value >+ self._Macros[Name] =3D Value > # some special items in [Defines] section need special treatm= ent > elif Name in ('EFI_SPECIFICATION_VERSION', >'UEFI_SPECIFICATION_VERSION', 'EDK_RELEASE_VERSION', >'PI_SPECIFICATION_VERSION'): > if Name in ('EFI_SPECIFICATION_VERSION', >'UEFI_SPECIFICATION_VERSION'): > Name =3D 'UEFI_SPECIFICATION_VERSION' > if self._Specification =3D=3D None: >@@ -1954,10 +1953,11 @@ class InfBuildData(ModuleBuildClassObject): > self._CustomMakefile[TokenList[0]] =3D TokenList[1] > else: > if self._Defs =3D=3D None: > self._Defs =3D sdict() > self._Defs[Name] =3D Value >+ self._Macros[Name] =3D Value > > # > # Retrieve information in sections specific to Edk.x modules > # > if self.AutoGenVersion >=3D 0x00010005: >-- >2.6.1.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel