The changes look consistent with my conditional r-b: https://lists.01.org/pipermail/edk2-devel/2017-July/012413.html
On 2017-07-19 22:44:04, Michael D Kinney wrote: > 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 <[email protected]> > Cc: Andrew Fish <[email protected]> > Cc: Jordan Justen <[email protected]> > Cc: Liming Gao <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney <[email protected]> > --- > 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 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
