From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CBA9721B06E8E for ; Mon, 17 Jul 2017 14:26:45 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2017 14:28:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,375,1496127600"; d="scan'208";a="128475040" Received: from mdkinney-mobl1.amr.corp.intel.com ([10.254.111.65]) by fmsmga006.fm.intel.com with ESMTP; 17 Jul 2017 14:28:32 -0700 From: Michael D Kinney To: edk2-devel@lists.01.org Cc: Leif Lindholm , Andrew Fish , Jordan Justen , Liming Gao Date: Mon, 17 Jul 2017 14:28:28 -0700 Message-Id: <20170717212829.36548-2-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.13.1.windows.2 In-Reply-To: <20170717212829.36548-1-michael.d.kinney@intel.com> References: <20170717212829.36548-1-michael.d.kinney@intel.com> Subject: [Patch 1/2] BaseTools/PatchCheck: Support Contribution Agreement 1.1 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2017 21:26:46 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=628 Update PatchCheck.py to support either "Contributed-under: TianoCore Contribution Agreement 1.0" or "Contributed-under: TianoCore Contribution Agreement 1.1" in the commit message. Cc: Leif Lindholm Cc: Andrew Fish Cc: Jordan Justen Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- BaseTools/Scripts/PatchCheck.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 7bc5736dbf..135f1c0112 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -77,8 +77,10 @@ class CommitMessageCheck: def check_contributed_under(self): cu_msg='Contributed-under: TianoCore Contribution Agreement 1.0' if self.msg.find(cu_msg) < 0: - self.error('Missing Contributed-under! (Note: this must be ' + - 'added by the code contributor!)') + cu_msg='Contributed-under: TianoCore Contribution Agreement 1.1' + if self.msg.find(cu_msg) < 0: + self.error('Missing Contributed-under! (Note: this must be ' + + 'added by the code contributor!)') @staticmethod def make_signature_re(sig, re_input=False): -- 2.13.1.windows.2