Re: [PATCH 0/2] BaseTools: minor PatchCheck.py fixes/changes

["Bob Feng" <bob.c.feng@intel.com>]

Merged.

-----Original Message-----
From: Leif Lindholm <leif@nuviainc.com> 
Sent: Thursday, July 2, 2020 11:40 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
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 <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>

 BaseTools/Scripts/PatchCheck.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

-- 
2.20.1