From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::42f; helo=mail-wr1-x42f.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (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 6843120D7B273 for ; Mon, 10 Dec 2018 04:30:16 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id x10so10265498wrs.8 for ; Mon, 10 Dec 2018 04:30:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Pf+4xzlWouGrsD0jp67EiuzzTmw8wL2bw80TcyEZQjk=; b=MO9SFqEh6K/kuZvNVtoHtKoZi73yYFmVczIwZKeyOoxOp1K8GucXdHJM+naqv83VsY u7wGQZXpGZ4VTZkh/i/KdSzeWtHTsyHQEBgXLEtMNmgcjmqCMcojwSf6R8fXR3h9EvnW sF9uDFcCsuoFgdkMBEMBXqF3m7UT27Tlm7uwk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Pf+4xzlWouGrsD0jp67EiuzzTmw8wL2bw80TcyEZQjk=; b=Tekvrr7UXSbMrh1KM1O6jfeIAo+B2QpjQkUJ5u0uu9gMzpAhTdQxV+bXmMTSWIUrRE s/Sx03Qb1h3JQHNZXIz3pGqZBzyuBmtK2ywD+85EJoCZ0Hi1QSREviEZeGsdDay0hHTH eOYoI4WbupiLWI2cuob/aFu2QIDhg5yvqmD4NN/oX4kNWce6ucfxrmNzH/y3pGipfywx uKkIQc8hXyoysNaOfGzbi0sHVyxnYk7Ln354XiBYbuS7tRYTtI6hyd4xRNBxcvwfLna0 PfuboX3J9g0S+MU6VWosoRTexo5OEC+Qpz133021vnrEoYuPFHnq/Hxhs8Ro8dRbvg5u A1xA== X-Gm-Message-State: AA+aEWb8opqO42ZVmmpz/WK9yObljTZCcVeOg//4UHZveJTCkXOuwCqH KUuLetJxC2WjHLt2v1qqC/bJRw== X-Google-Smtp-Source: AFSGD/UQu2YJzo65CWOWkbEgQa2PiCwUv3NZ5DARRZOX8Zl9geHtLbebABPfGlLvMObS/ZrluwX0fA== X-Received: by 2002:adf:8421:: with SMTP id 30mr10060902wrf.153.1544445014787; Mon, 10 Dec 2018 04:30:14 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id x10sm13647293wrn.29.2018.12.10.04.30.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 04:30:13 -0800 (PST) Date: Mon, 10 Dec 2018 12:30:12 +0000 From: Leif Lindholm To: BobCF Cc: edk2-devel@lists.01.org, Liming Gao Message-ID: <20181210123012.cswf2pbzppqxff27@bivouac.eciton.net> References: <20181210011658.5212-1-bob.c.feng@intel.com> MIME-Version: 1.0 In-Reply-To: <20181210011658.5212-1-bob.c.feng@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [Patch V2] 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: Mon, 10 Dec 2018 12:30:16 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Bob, On Mon, Dec 10, 2018 at 09:16:58AM +0800, BobCF wrote: > From: "Feng, Bob C" > > V2: Patch version information does not belong in the commit message. It belongs in a cover letter, or if a cover letter is not used, you can put these details below the --- line. This way it gets filtered out by git. The patch commit message should end up being a description of what the patch is and does, not the development process that got us there. Regards, Leif > update the commit log. This issue is introduced by > the commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5 > > V1: > https://bugzilla.tianocore.org/show_bug.cgi?id=1386 > 1. There is no Pcd value assignment in Dsc file > 2. There are duplicate Pcd filed assignment > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- > BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/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] = OrderedDict() > if DimensionAttr not in self.SkuOverrideValues[SkuName][DefaultStoreName]: > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr] = collections.OrderedDict() > if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr]: > - del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName][DimensionAttr] > + del self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] = [Value.strip(), FileName, LineNo] > return self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] > > def SetPcdMode (self, PcdMode): > self.PcdMode = PcdMode > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/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 = None > return > TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1) > self._CurrentPcdName = TokenList[0] > - if TokenList[1].strip().startswith("{CODE"): > + if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"): > self._PcdDataTypeCODE = True > self._PcdCodeValue = TokenList[1].strip() > > if self._PcdDataTypeCODE: > if self._CurrentLine.endswith(")}"): > -- > 2.19.1.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel