From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.10689.1595384473797922683 for ; Tue, 21 Jul 2020 19:21:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ypS6GN+x; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: guomin.jiang@intel.com) IronPort-SDR: /YMIajHx+2SJiflGWELV8IfJtZrIfd881o14GDnts504P3NKvl2KXi79hGUuqIZD4ZtS8dpi0H URWGbpspdXHA== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="130342706" X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="130342706" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 19:21:12 -0700 IronPort-SDR: sayPSFs2Gnb/fE33J6w7pIfqKrF0k7GMQVePlsc0znaOz+e/okFOWiTGc+bTHoA5HWBeeFMtEc xevZdLJLytzQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,381,1589266800"; d="scan'208";a="318529197" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2020 19:21:12 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:21:12 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:21:11 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.175) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Jul 2020 19:21:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVvsOnl9pnuZpycQVGkDklH+SxmQrqc2AmR514FgDf2fatuB+67pPd2ekT3gw18EOUKJjukGh/mgoF7JXvi9z+N6rBn3Izfgr0UWdDSLx234PTXn/B4M8d6hDufqhnpqEeadJtPvf+LS0oT6AMWYbVZf1nSUwNAoQf3AuiSgvefMVzqAj3kVIQiYkfbNVusN/uwB6kKtsQPCAglTPi5lRNjn+sgjHFD+pEyS7RlcNlk1tuYtnvNFKr2UM8CgAWAPLrdMLlBvYx7rO3jLzmTLhERFdZ3avpO+0qQJrxTo3V2vPOkG5Nzqakm6ntNBYlCC6qtsDp5uCob8OdEQQ65jKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7oPI4Hu8REM0rPonuv9rfdRI4LkfGcQVyU38cjm9Qlk=; b=cMpr89zmwHuu7CqI6h826mnvaWhXv5Z6jHtUzLYBqkRJWejsBoDddXeOlWz4ZF0Sb5qoq0JSVTZrxNaltxr8Z6jalOBN9THpMX9ykKeu6ciaCQmmu0Wp2cYYbeJxI+Nv4P7kUeo0uTfrJ8E3AlDLo4tEZ/rEz/BXe621TqYRcXwFmzwnpKiRg9GwB0rjyZLToGULayc5fcSU4aR8AVdUUd7CUtWJsg1nRjToP3IA5f7/vqEAkt74wDGg9VAPcII4PX2PvCF3r+n5XHRGMW1mI3rxptcq6IYEa4LsEr0eklJKkOstNvL9Gh08CFSSSz9VlskPnuNwdPTZUpwTdy8ZLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7oPI4Hu8REM0rPonuv9rfdRI4LkfGcQVyU38cjm9Qlk=; b=ypS6GN+xCzTFgMrOc94H5/Ebi/Iu8igNseatXVJyRFydXBlghn/kPtisIL1aHkID52mBxmCySFNBuW0pkZ4cH18YDucOgfTkf1qKVnbC4CjOD1q192tSx2rVN9CxvCIpEMLinjKgNmreo4ly7MMLgkVsk6K6UWqzD1wWDP242nI= Received: from DM6PR11MB2955.namprd11.prod.outlook.com (2603:10b6:5:65::31) by DM5PR11MB1531.namprd11.prod.outlook.com (2603:10b6:4:10::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Wed, 22 Jul 2020 02:21:08 +0000 Received: from DM6PR11MB2955.namprd11.prod.outlook.com ([fe80::e916:c766:fc41:b51d]) by DM6PR11MB2955.namprd11.prod.outlook.com ([fe80::e916:c766:fc41:b51d%5]) with mapi id 15.20.3174.027; Wed, 22 Jul 2020 02:21:08 +0000 From: "Guomin Jiang" To: "Feng, Bob C" , "Gao, Liming" , "devel@edk2.groups.io" Subject: Re: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Topic: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when upgrade submodule. Thread-Index: AQHWXwrkYnJRMUcK906BeNpl3KGPPqkRiSKggABNcVCAAQVCgIAAAZTw Date: Wed, 22 Jul 2020 02:21:08 +0000 Message-ID: References: <20200721025846.2249-1-guomin.jiang@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.203] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2ac92bf7-5af9-4fbd-6954-08d82de5e536 x-ms-traffictypediagnostic: DM5PR11MB1531: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:513; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: X3QsY4P7KztphBTNOmmuGCH4YnEPe1c98WRv6LbGqyA5zOmp33jBllJdNwKnnv5Z04mTRVCvZ+Qh1nLgxw4JJamwB85xMuJDFwOD2kZskFaQC0J1w3PFHTH6aK2UPE7MSJBoUCAaOm94FleXN2smUfcVttBA6H5kBjGGzhtDlUAQ+2wl/sY2vVjg2izk6YF+7BGvj2D9gTt7HfCmXcNgfzyEp3rDTdE0rToJBb+DAiVl6N1tCZa91T8GoI4xoHFNPUqc7j208o6/NfAsgFAyESOpJDf0f+n6w3NRT0SUD0cdwK+EZLZxPye3vIuaQL+N/ex4Ph4Lmb/a9eFGmDc6Rg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB2955.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(376002)(396003)(136003)(346002)(366004)(6506007)(53546011)(186003)(8936002)(8676002)(5660300002)(71200400001)(26005)(478600001)(316002)(110136005)(76116006)(86362001)(7696005)(83380400001)(2906002)(55016002)(33656002)(9686003)(66556008)(52536014)(64756008)(66946007)(66476007)(66446008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: b2DBDcB9pdsgPNueZzVOAMoIgOBwpeZxEq7svBMNg9tamzqOIZzySUUd3CXW9t0NSYPqEr/uPwDgD/myxEv5uASbAi/GIvj1DTpTaAFar0kWYX3LJo9x7LeWGJ7IO//cKcShFHwMfqmqprITLx6wYvOz6R9xZWWZZpTBJyfipTlqLLZi1OyB7oip9KlyfOGtbeeTMgT3BYQ/jOVdMOfvro+8iHG1RMAUAiSq1P7Uh43gB+ytIDLoj3esrWYT3ju0uqUPYXZqPQPt5JHJkTHK5Nv9b6Qj2iHbScmmfJs0bRqigrijzfuD+DBYPJGVNA6C9GQNSQ2m/QhuYBxkIkusFUGapzaXK8zoG9np0B2BUNRC/9jpd8wNqHAceAaXROWlLriyO0zGOazREjMndxlE7s27y4ioj8bVvU7tz9GNyxB+TsChG62NnMAg61ZAOsSwK55weg4V8dkDnW0+FH8p+IEbvNn7NI33/HtIlEmRryNE4rxrQPGTRwoE6XO1YbXH MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2955.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ac92bf7-5af9-4fbd-6954-08d82de5e536 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 02:21:08.8174 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8amIfQaNRTO3d/5Or9NqindIAGvCDoSzRHjNNyh/DosmPi91Ne0qq9DwwBKxKIAQwU/xysuKyAV8XJx8l2ySwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1531 Return-Path: guomin.jiang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Hi Bob, Can you provide a sample that the file attribute is not the next line. Even if the case you mentioned is present, I seem that have not affect on t= he current behavior, isn't it? Thanks. Guomin > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, July 22, 2020 10:08 AM > To: Jiang, Guomin ; Gao, Liming > ; devel@edk2.groups.io > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when > upgrade submodule. >=20 > Guomin, >=20 > I have two comments. > 1. Please only descript the patch's function in the commit message. > 2. The file attribute is not always the next line of the line starts with= "diff -- > git" >=20 > Thanks, > Bob >=20 > -----Original Message----- > From: Jiang, Guomin > Sent: Tuesday, July 21, 2020 6:38 PM > To: Gao, Liming ; devel@edk2.groups.io > Cc: Feng, Bob C > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when > upgrade submodule. >=20 > It is used to judge if the current change is for submodule. >=20 > The attribute of submodule is 160000, just like the file attribute of fil= e is > 10644. >=20 > Normally, the changed file will begin with 'diff --git' and the next line= like ' > index 954f66c056e..04300e71f38 100644' which end with the attribute, and > changed submodule is similar. >=20 > > -----Original Message----- > > From: Gao, Liming > > Sent: Tuesday, July 21, 2020 1:57 PM > > To: Jiang, Guomin ; devel@edk2.groups.io > > Cc: Feng, Bob C > > Subject: RE: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when > > upgrade submodule. > > > > Guomin: > > + self.lines[self.line_num+1].endswith('160000\n') = or > > > > What means for this line? > > > > > > Thanks > > Liming > > -----Original Message----- > > From: Jiang, Guomin > > Sent: 2020=1B$BG/=1B(B7=1B$B7n=1B(B21=1B$BF|=1B(B 10:59 > > To: devel@edk2.groups.io > > Cc: Feng, Bob C ; Gao, Liming > > > > Subject: [PATCH 1/1] BaseTools/Scripts: Ignore the CRLF check when > > upgrade submodule. > > > > When i upgrade openssl to 1.1.1g, error occurred when run PatchCheck.py= . > > The reason is that the submodule will end with LF, but it will check > > based on file rule, it make no sense and need ignore the check. > > > > Signed-off-by: Guomin Jiang > > Cc: Bob Feng > > Cc: Liming Gao > > --- > > BaseTools/Scripts/PatchCheck.py | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/BaseTools/Scripts/PatchCheck.py > > b/BaseTools/Scripts/PatchCheck.py index 7db0775d14d1..46b9936c6576 > > 100755 > > --- a/BaseTools/Scripts/PatchCheck.py > > +++ b/BaseTools/Scripts/PatchCheck.py > > @@ -405,12 +405,16 @@ class GitDiffCheck: > > # > > self.force_crlf =3D False > > if self.filename =3D=3D '.gitmodules' or \ > > + self.lines[self.line_num+1].endswith('160000\n') > > + or \ > > self.filename =3D=3D 'BaseTools/Conf/diff.order': > > # > > # .gitmodules and diff orderfiles are used interna= lly by git > > # use tabs and LF line endings. Do not enforce no= tabs and > > # do not enforce CR/LF line endings. > > # > > + # When update submodule, it will encode with LF li= ne and do > > + # not enforce CR/LF line endings. > > + # > > self.force_crlf =3D False > > self.force_notabs =3D False > > elif len(line.rstrip()) !=3D 0: > > -- > > 2.25.1.windows.1