From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.5612.1593760817557424732 for ; Fri, 03 Jul 2020 00:20:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=XFZwV87C; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bob.c.feng@intel.com) IronPort-SDR: 6H8j8QN+aXeIak8e6VXw6BAp2WD0ZgNlLFkajuExkvQviLJsyJZcYLfGCxpHJ5XJTSZzMQTt15 9ATKl02W8uiA== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="145242641" X-IronPort-AV: E=Sophos;i="5.75,307,1589266800"; d="scan'208";a="145242641" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2020 00:20:16 -0700 IronPort-SDR: TJ+Ad6iToTfCLDZm9HhYp0DlPmXUAL666S1cB5BlymeSd04OFflBvr4FXYuNXZY9vewyP9Vt7b uNzqAVtsBelA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,307,1589266800"; d="scan'208";a="426213943" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga004.jf.intel.com with ESMTP; 03 Jul 2020 00:20:16 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 3 Jul 2020 00:20:15 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 3 Jul 2020 00:20:15 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 3 Jul 2020 00:20:15 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.103) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 3 Jul 2020 00:20:15 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLRApea72tSRhN+zCb5puundDce4K9ctnHZmDW11H27c2++bF8hzqAPXG3I1OUlqkniaaZBBuKfn3su50josRUHLn/4yAsEdAomLoEIrA31JehODljhPf3iciFPT9517UY8csa9R5PX56e7WrgxgIM7I/QQLCyHpA2K1XGI6JY6DYOGm5yl5ycuQI63sEpD72/+ajZHBv9YrPWi+iJnDjuZU+6Rf9/Cq50zpN0ynPOlQqOhXv1WZjrneDvi6T6KpiZjdCx7KA1tcPmM5H5BlmmUvLmktliVxd1qMl+qSrqftX2Yny3DZG2DggfZlIQxuud/QeGgpCzKPlr2NL4h7CQ== 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=OPiAENgvlt1NkHn0P8f9NhBhRg4IVmaH5iA4JdsIlAo=; b=P5pZPCXevUaJhe3xXRGiiy+URYt1OyVg4kbn7XVncAvH37Y1REksNAY/hNV4NLDnVfiQmqqGDtW4hCkeS5gFPvvK/FCtr4gZ88QNymsssLbepnuwvnqGSOcvbJy2nSocivwrbWdQJt1gVSO5Wus0i7lYb1urf6G0MCQAEPyzLv62LUOJJV7V+Leic+mCL1rou0HnW8DvUluAKQClKIolemsncb70+gJCvZEr8etFolN3v8fD6iyUcMKuEDDW4+Ohbt5YI2BLc/CwPmIXDh7v4lHdv/80p8Upk9e4ROAcfcxY8FImPduGiR2oifRwyJeTA20sr/mHyeKTP8Bv5NXdCQ== 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=OPiAENgvlt1NkHn0P8f9NhBhRg4IVmaH5iA4JdsIlAo=; b=XFZwV87CwSRgR9Do5YAH7HZ/NoLjyCpkoiqjdOOrB7OdMSxWR4y7nXY7oX2HIBwzGGtJGWcFs3U+Dj+f/3/HDh/v5Zk1iPhMmhbMpQTUQUxZEvu9l6bWEtv2M4Bu5CQajgSLZ6fQWmYMzMUSlwKtpw/Vn4vPRhm7lrdamhXzbu0= Received: from BN6PR11MB0068.namprd11.prod.outlook.com (2603:10b6:405:69::17) by BN6PR11MB4084.namprd11.prod.outlook.com (2603:10b6:405:7f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.23; Fri, 3 Jul 2020 07:20:14 +0000 Received: from BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::6870:82d3:5bde:4153]) by BN6PR11MB0068.namprd11.prod.outlook.com ([fe80::6870:82d3:5bde:4153%6]) with mapi id 15.20.3131.034; Fri, 3 Jul 2020 07:20:14 +0000 From: "Bob Feng" To: Leif Lindholm , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [PATCH 0/2] BaseTools: minor PatchCheck.py fixes/changes Thread-Topic: [PATCH 0/2] BaseTools: minor PatchCheck.py fixes/changes Thread-Index: AQHWUIcL5em2tkU8Zk2ut+BXqkBzhqj1c1hg Date: Fri, 3 Jul 2020 07:20:14 +0000 Message-ID: References: <20200702153934.25262-1-leif@nuviainc.com> In-Reply-To: <20200702153934.25262-1-leif@nuviainc.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: nuviainc.com; dkim=none (message not signed) header.d=none;nuviainc.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a07680d5-14c8-49b2-6a84-08d81f2187bc x-ms-traffictypediagnostic: BN6PR11MB4084: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 045315E1EE x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: n8+PoGKeUnbUfPOkaCsNUoGBpnxePqKaIlyl9H7bBnX2mD8XR6azB0mZmhVSbO3wxAcU/+2cy/HUc/7GA2Jb5jKH0DB+tCnZNOe0gKBzcA+zwu/l6VD4w+WxWlFeMla0Z61C3Y6o0onBdCXMKcLLaGdU2pSDDBUfWeGV1ioCF9I55r9cPSmFQGWP9dRwXlw187jsXVcD9QaKCiGSROioEtHHds+rGCI/T3rHvwDKQhvPQNunJ/vti/RHpwgB8lHcUD3a+oV/HxFHjrvZ3Xa7Uk0DYmFU1rN1HUdCqjpJTeMI5IKknw3dJOjinffXP9jLGJ91TWUwvZGudJtoPqYbBM+8aZNRf8sA5BZx36DIqu9qPQnLmWMqYmEEk75R8gzlPSLlmEHGuWRBZPtMInhusA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB0068.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(376002)(39860400002)(136003)(396003)(366004)(346002)(64756008)(66556008)(2906002)(66476007)(26005)(66446008)(76116006)(8936002)(966005)(4744005)(107886003)(66946007)(478600001)(6506007)(71200400001)(4326008)(7696005)(186003)(52536014)(316002)(83380400001)(8676002)(33656002)(86362001)(110136005)(55016002)(5660300002)(53546011)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: yJcoUkax6rnfQVKn8ey+QWB96G9ERuxBTovagqMaVOHypiwf8AxuvYzxahcFvzBRccdS++vXyolUiIhWDHZh5G69VXQWxx2dEMsQX0kJYHyTx7zlZewCQIoan5rt6fN4aBb46GSASBHJfyuak4JjcmRys+8FCCeITGhnn2gucb8SDE1YCJ4cFpBaPQIvl2lJ79IXkK7QVxzUilby8NNuE+Wxbf6EDtxklSxewbFm9rDq9DURN+mv4DtXRszpO36XyeLgtkzhrDnXEyvxhcxWeql3TDq8A68wvpmwOnXakpZbuCPkg2M331PkV8UC2ayRynT0IUEIWQeXQco1OpFmK66HRPaKVcOH1NjZgUs+sy0Sv6fMa4JEZTZlfCp0HaZhrCZWpa0Lx6sP2weitFZAi+xC83KPedLk6OxurYukrp+E3Cn/WubJqDa7BXHKJ4zhxdqIz73rlxulR8V2cUmdn1wVngHLZZWvFn3N9usZafZCjHay6GfwbTPit5i5YvnI MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB0068.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a07680d5-14c8-49b2-6a84-08d81f2187bc X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jul 2020 07:20:14.2520 (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: SjKXF0j8Hhxr366tPvxyjh0G2GrshcIZAxjwglg6Fe35pKnhmecQlQ9Uh+W43rAXzbu/dvJUNJZ8UNtY+kaghw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB4084 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Merged. -----Original Message----- From: Leif Lindholm =20 Sent: Thursday, July 2, 2020 11:40 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Gao, Liming Subject: [PATCH 0/2] BaseTools: minor PatchCheck.py fixes/changes 1: https://github.com/tianocore/edk2/pull/549 failed to merge, since PatchCheck.py reports an error. Add BaseTools/Conf/diff.order to the same exception clause currently used for .gitmodules to permit the merge to progress. 2: On Debian 10, PatchCheck.py fails to run with the system default python (2). This patch fixes that. (This uses the improved version suggested by Bob.) Leif Lindholm (2): BaseTools/PatchCheck.py: add exception for diff orderfile BaseTools: explicitly import email.header PatchCheck.py Cc: Bob Feng Cc: Liming Gao BaseTools/Scripts/PatchCheck.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --=20 2.20.1