From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 D51FE82164 for ; Thu, 23 Feb 2017 02:56:24 -0800 (PST) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72F1F804E2; Thu, 23 Feb 2017 10:56:25 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-58.phx2.redhat.com [10.3.116.58]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1NAuOae028700; Thu, 23 Feb 2017 05:56:24 -0500 To: Yonghong Zhu , edk2-devel@ml01.01.org References: <1487779395-10744-1-git-send-email-yonghong.zhu@intel.com> Cc: Liming Gao From: Laszlo Ersek Message-ID: <2f4c8427-91b2-87c4-3813-de92d835b7e3@redhat.com> Date: Thu, 23 Feb 2017 11:56:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <1487779395-10744-1-git-send-email-yonghong.zhu@intel.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 23 Feb 2017 10:56:25 +0000 (UTC) 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 10:56:25 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 02/22/17 17:03, Yonghong Zhu wrote: > 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(-) I see that this patch has been committed. It fixes the issue for me as well. Tested-by: Laszlo Ersek Thanks! Laszlo > 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 = {} > # 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] = Value > if self._Defs == None: > self._Defs = sdict() > self._Defs[Name] = Value > + self._Macros[Name] = Value > # some special items in [Defines] section need special treatment > 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 = 'UEFI_SPECIFICATION_VERSION' > if self._Specification == None: > @@ -1954,10 +1953,11 @@ class InfBuildData(ModuleBuildClassObject): > self._CustomMakefile[TokenList[0]] = TokenList[1] > else: > if self._Defs == None: > self._Defs = sdict() > self._Defs[Name] = Value > + self._Macros[Name] = Value > > # > # Retrieve information in sections specific to Edk.x modules > # > if self.AutoGenVersion >= 0x00010005: >