From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-x230.google.com (mail-io0-x230.google.com [IPv6:2607:f8b0:4001:c06::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 015B98222D for ; Wed, 22 Feb 2017 08:08:14 -0800 (PST) Received: by mail-io0-x230.google.com with SMTP id j13so4998775iod.3 for ; Wed, 22 Feb 2017 08:08:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=azyH9dYqCpJA0yNWtMLj+HVCqIaAmGOedAitqGPRVXA=; b=JtANDoHALkvCaDRHF2I4u/3IPqlO/dc3s0JscFP72fAtzhA8QEy0tNOTopXCXjkCIg g4TSiQ5ZEbvs2w643IF/xWMDLuvSMgfx7yyy96EGm3T/A4F63yHd0+fJNKNwn99HuIlN ruPnX96vZeasbMymhV3NOSe7a9MzCGjxIHAXI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=azyH9dYqCpJA0yNWtMLj+HVCqIaAmGOedAitqGPRVXA=; b=U6SIpiacmzH2vyBkxusRupNRntI6OUr4sH8H3Fu5GkPQ2DpkNl1xxPoTnnx67ic9HK 43vKLiLGCnRIWUGVgPsN91numgYKvm//XuqhUhdrD+3/nRmxk/zZ7ietcPfoRQ5F2Jl3 qzEdivae43bH3nCH2ceWyczdTVGMnbqk5x69JoAL7ONgrekdGmspng7jhi9hz2qDoUnk s6FJn2Me36ncWO925S5ovriAVWgYMTLuuX6DNOpaQJH26hEiesAWkDdUqkNGCOSIeg7c DRM4F+G87iOOsL5xmQSPC63VH4yHD/YYrTs11CR368n9Iwp4n8h/mXBxPiXb9H7bs6rz zQ2w== X-Gm-Message-State: AMke39lsZgWemnyyG9eKplJ5u/pEeP9GI5q7ecGtzjhlO63amTQw5TUnPHcejSA3lTxEeRQxXHSmWkraIR6fScHi X-Received: by 10.107.13.130 with SMTP id 124mr15559213ion.83.1487779693273; Wed, 22 Feb 2017 08:08:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.198.134 with HTTP; Wed, 22 Feb 2017 08:08:12 -0800 (PST) In-Reply-To: <1487779395-10744-1-git-send-email-yonghong.zhu@intel.com> References: <1487779395-10744-1-git-send-email-yonghong.zhu@intel.com> From: Ard Biesheuvel Date: Wed, 22 Feb 2017 16:08:12 +0000 Message-ID: To: Yonghong Zhu Cc: "edk2-devel@lists.01.org" , Liming Gao 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: Wed, 22 Feb 2017 16:08:14 -0000 Content-Type: text/plain; charset=UTF-8 On 22 February 2017 at 16: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 Works for me, thanks Tested-by: Ard Biesheuvel > --- > 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 = {} > # 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: > -- > 2.6.1.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel