public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Michael D Kinney <michael.d.kinney@intel.com>
To: edk2-devel@lists.01.org
Cc: Leif Lindholm <leif.lindholm@linaro.org>,
	Andrew Fish <afish@apple.com>,
	Jordan Justen <jordan.l.justen@intel.com>,
	Liming Gao <liming.gao@intel.com>
Subject: [Patch 1/2] BaseTools/PatchCheck: Support Contribution Agreement 1.1
Date: Mon, 17 Jul 2017 14:28:28 -0700	[thread overview]
Message-ID: <20170717212829.36548-2-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20170717212829.36548-1-michael.d.kinney@intel.com>

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 <leif.lindholm@linaro.org>
Cc: Andrew Fish <afish@apple.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 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



  reply	other threads:[~2017-07-17 21:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-17 21:28 [Patch 0/2] Update to Tiano Contribution Agreement 1.1 Michael D Kinney
2017-07-17 21:28 ` Michael D Kinney [this message]
2017-07-17 22:13   ` [Patch 1/2] BaseTools/PatchCheck: Support " Jordan Justen
2017-07-18 15:59     ` Kinney, Michael D
2017-07-18 16:12       ` Jordan Justen
2017-07-17 21:28 ` [Patch 2/2] edk2: Update to Tiano " Michael D Kinney
2017-07-18  0:01   ` Jordan Justen
2017-07-18 18:24     ` Kinney, Michael D
2017-07-17 21:43 ` [Patch 0/2] " Leif Lindholm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170717212829.36548-2-michael.d.kinney@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox