From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web09.20026.1605677800580491756 for ; Tue, 17 Nov 2020 21:36:42 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 18 Nov 2020 13:36:37 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Liang, MingyueX'" Cc: "'Chen, Christine'" References: <20201113073301.1028-1-mingyuex.liang@intel.com> <164876971E6C4F0C.5807@groups.io> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIFYyXSBCYXNlVG9vbHM6IFJlc29sdmUgaW5kZXggb3V0IG9mIHJhbmdlIGVycm9ycy4=?= Date: Wed, 18 Nov 2020 13:36:38 +0800 Message-ID: <00df01d6bd6c$c951d7b0$5bf58710$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQLOc98dOjs5/JpauUrbn9vc7GoS/gJB9ie8AocP33Knt6mEsA== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Bob: I am ok to merge this bug fix for this stable tag. Reviewed-by: Liming G= ao Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: bounce+27952+67662+4905953+8761045@groups.i= o > =E4=BB=A3=E8=A1=A8 Bob Fe= ng > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2020=E5=B9=B411=E6=9C=8818=E6=97= =A5 10:24 > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io; Feng, Bob C ; Liang, > MingyueX > =E6=8A=84=E9=80=81: Liming Gao ; Chen, Christi= ne > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH V2] BaseTools: Resolve index= out of range > errors. >=20 > This patch is to fix a basetools regression issue. If there is no object= ion, I'll > merge it tomorrow. >=20 > Thanks, > Bob >=20 > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob Feng > Sent: Wednesday, November 18, 2020 9:41 AM > To: Liang, MingyueX ; devel@edk2.groups.io > Cc: Liming Gao ; Chen, Christine > > Subject: Re: [edk2-devel] [PATCH V2] BaseTools: Resolve index out of ran= ge > errors. >=20 > Reviewed-by: Bob Feng >=20 > -----Original Message----- > From: Mingyue Liang > Sent: Friday, November 13, 2020 3:33 PM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Liming Gao > ; Chen, Christine > Subject: [PATCH V2] BaseTools: Resolve index out of range errors. >=20 > This problem is generated by solving bz2972's patch, and the commit ID i= s > 0af7f8e6a9253960ba820cd6ddfd8c36543d30cb. >=20 > This is a problem when updating the DEPs file. > The code does not consider that there is only one line of content in the= file, so > the filter condition is added to prevent the index from exceeding the ra= nge. >=20 > Signed-off-by: Mingyue Liang > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > --- >=20 > V2=EF=BC=9A > Change the title to make it clearer and more descriptive. >=20 > BaseTools/Source/Python/AutoGen/IncludesAutoGen.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > index b06ef42573fd..5ec26eb98b42 100644 > --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > @@ -291,7 +291,8 @@ ${END} > targetitem =3D self.GetRealTarget(source_abs.strip(" :"= )) >=20 > targetitem +=3D ": " > - targetitem +=3D lines[1] > + if len(lines)>=3D2: > + targetitem +=3D lines[1] > newcontent.append(targetitem) > newcontent.extend(lines[2:]) > newcontent.append("\n") > -- > 2.29.2.windows.2 >=20 >=20 >=20 >=20 >=20 >=20 >=20 >=20 >=20 >=20