From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 5F0C02095D8F6 for ; Tue, 18 Jul 2017 14:15:11 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jul 2017 14:17:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,378,1496127600"; d="scan'208";a="1174111865" Received: from mdkinney-mobl1.amr.corp.intel.com ([10.24.14.249]) by fmsmga001.fm.intel.com with ESMTP; 18 Jul 2017 14:17:04 -0700 From: Michael D Kinney To: edk2-devel@lists.01.org Cc: Leif Lindholm , Andrew Fish , Jordan Justen , Liming Gao Date: Tue, 18 Jul 2017 14:16:56 -0700 Message-Id: <20170718211701.37196-2-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.13.1.windows.2 In-Reply-To: <20170718211701.37196-1-michael.d.kinney@intel.com> References: <20170718211701.37196-1-michael.d.kinney@intel.com> Subject: [Patch 1/6] 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: Tue, 18 Jul 2017 21:15:11 -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. Temporarily continue to allow the TianoCore Contribution Agreement 1.0 agreement. 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 7bc5736dbf..43bfc2495c 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -75,10 +75,13 @@ class CommitMessageCheck: count += 1 def check_contributed_under(self): - cu_msg='Contributed-under: TianoCore Contribution Agreement 1.0' + 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!)') + # Allow 1.0 for now while EDK II community transitions to 1.1 + 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!)') @staticmethod def make_signature_re(sig, re_input=False): -- 2.13.1.windows.2