From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web12.9618.1593704377016332313 for ; Thu, 02 Jul 2020 08:39:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=gN5Sezmi; spf=pass (domain: nuviainc.com, ip: 209.85.128.49, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f49.google.com with SMTP id g10so9317206wmc.1 for ; Thu, 02 Jul 2020 08:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GiyDfVsNjhgIxe5QLPM3eBF4Kz59RzM9ddW5xuehSnk=; b=gN5Sezmi5yH9bUl//UNHGhaSRajsqfQ5QQzf9SHJ3f7YQUOs0k05H44iIWOFWrEv2Y co6HZFmUAhknqqNFHr99DmRNfitDa9YprtI67JhmMleEOIYSo3tMVLoXjCNZQoR4bv6B XtdRwjhmvhY146BFcUwc7rm+FoaskjHsZiuLmHlrex4nzaq01vObKaYSitndS6s/5PtT DiK6JkrupcXav926pNfbKENeqdOGsC3QoLs8FuuzzWN7jbPxMcW2t9wIJzUhA1gQy2ct z6oo4u3EybsZ89vJuLazE5Occ8BuvGtYP36TwGi29NF2Wx8i6ppBbWQLdZUi39fBcLVe jdDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GiyDfVsNjhgIxe5QLPM3eBF4Kz59RzM9ddW5xuehSnk=; b=MNrb85uarOJF4HuKReVwdls3r78wXpN/NbngMQs+WOqnxI7KCd/mLU1Yos9aY05dZ0 UoHlIXQFEYlPqnSy1HK0Hu7IwKsv9lURyUKSgl6oWedsaoDYZGOvls09a2wvNiT8/24U Zijxy99vWEPNJGfU8eiaJt3L3sNyuhZ2n/lTjLf8WRi/NhrQLAFL2pbkrTfvJyZDwDFT fXqksqLQ6p8yAgGSrqSvkmMC9y49mzXIW3cwYtDz0lBwncrMQzdJdBsE8WuNdha8HnLM bJ/iMZL+JWzsPaIPDQaHA+ArUltWuGKjdyeL9v9pMtsAiqi5Ayi3WP7wSmh9ZJloD+wb OXkw== X-Gm-Message-State: AOAM533t2VxL+NFzmiXWXWDKWPNyLcyzp0DYF3vb9eS0j1xR9RquLxhG 9hUyyqAwdEy2h0xpKV89ElBhoZqCJgD4Z3+gm3z3Kx7xfT3hNVB2xLT9jtsxUTDTyPwgCfnSIWq IPo+qpnRPmg9ea0H1l/W187H/RSACv9h09p2voZiHzRbH7IvI70m3tuyl0dvHdjex6w== X-Google-Smtp-Source: ABdhPJxkxZ0YecXVqa1QORjenU8VtWWtInU4ghDOAS4WzmwaO/s6APbxO3F22dpDu6fb8mjQtea1Ug== X-Received: by 2002:a1c:4d11:: with SMTP id o17mr31522489wmh.134.1593704375384; Thu, 02 Jul 2020 08:39:35 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id e5sm11540205wrs.33.2020.07.02.08.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 08:39:34 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH 0/2] BaseTools: minor PatchCheck.py fixes/changes Date: Thu, 2 Jul 2020 16:39:32 +0100 Message-Id: <20200702153934.25262-1-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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(-) -- 2.20.1