From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jordan.l.justen@intel.com>
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
 (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 1DA1421B06E8E
 for <edk2-devel@lists.01.org>; Mon, 17 Jul 2017 15:11:42 -0700 (PDT)
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
 by fmsmga105.fm.intel.com with ESMTP; 17 Jul 2017 15:13:35 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.40,376,1496127600"; d="scan'208";a="879862279"
Received: from unknown (HELO localhost) ([10.254.183.174])
 by FMSMGA003.fm.intel.com with ESMTP; 17 Jul 2017 15:13:34 -0700
MIME-Version: 1.0
To: Michael D Kinney <michael.d.kinney@intel.com>,  edk2-devel@lists.01.org
Message-ID: <150032961440.22153.12979783199124767709@jljusten-skl>
From: Jordan Justen <jordan.l.justen@intel.com>
In-Reply-To: <20170717212829.36548-2-michael.d.kinney@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>, Andrew Fish <afish@apple.com>,
 Liming Gao <liming.gao@intel.com>
References: <20170717212829.36548-1-michael.d.kinney@intel.com>
 <20170717212829.36548-2-michael.d.kinney@intel.com>
User-Agent: alot/0.5.1
Date: Mon, 17 Jul 2017 15:13:34 -0700
Subject: Re: [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  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jul 2017 22:11:42 -0000
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On 2017-07-17 14:28:28, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=3D628
> =

> 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/PatchChe=
ck.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=3D'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=3D'Contributed-under: TianoCore Contribution Agreemen=
t 1.1'
> +            if self.msg.find(cu_msg) < 0:
> +                self.error('Missing Contributed-under! (Note: this must =
be ' +
> +                           'added by the code contributor!)')

I'd probably try for a regex. Something like:

'^\s*Contributed-under: TianoCore Contribution Agreement 1\.[01]\s*$'

But you could also do something like:

for ver in ('1.0', '1.1'):
    cu_msg=3D'Contributed-under: TianoCore Contribution Agreement ' + ver
    ...
    if found: return
self.error('Missing Contributed-under! (Note: this must be ' +
           'added by the code contributor!)')

-Jordan