Merged. -----Original Message----- From: Leif Lindholm <[email protected]> Sent: Thursday, July 2, 2020 11:40 PM To: [email protected] Cc: Feng, Bob C <[email protected]>; Gao, Liming <[email protected]> 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 <[email protected]> Cc: Liming Gao <[email protected]> BaseTools/Scripts/PatchCheck.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.20.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#62013): https://edk2.groups.io/g/devel/message/62013 Mute This Topic: https://groups.io/mt/75260899/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
