[patch] repoman: Allow legacy "Gentoo Foundation" copyright before 2019.

0001-repoman-Allow-legacy-Gentoo-Foundation-copyright-bef.patch (text/plain), 1.75 KB, created by Ulrich Müller on 2019-06-18 11:52:34 UTC

From aa08bc502135d453538ff299f88c96402275abbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[e-mail]>
Date: Tue, 18 Jun 2019 13:48:33 +0200
Subject: [PATCH] repoman: Allow legacy "Gentoo Foundation" copyright before
 2019.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: https://bugs.gentoo.org/688278
Signed-off-by: Ulrich Müller <[e-mail]>
---
 .../repoman/modules/linechecks/gentoo_header/header.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/repoman/lib/repoman/modules/linechecks/gentoo_header/header.py b/repoman/lib/repoman/modules/linechecks/gentoo_header/header.py
index f94a8a50b..58185cd66 100644
--- a/repoman/lib/repoman/modules/linechecks/gentoo_header/header.py
+++ b/repoman/lib/repoman/modules/linechecks/gentoo_header/header.py
@@ -17,7 +17,8 @@ class EbuildHeader(LineCheck):
 
 	repoman_check_name = 'ebuild.badheader'
 
-	gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Authors$'
+	gentoo_copyright = (
+		r'^# Copyright ((1999|2\d\d\d)-)?(?P<year2>%s) (?P<author>.*)$')
 	gentoo_license = (
 		'# Distributed under the terms'
 		' of the GNU General Public License v2')
@@ -37,7 +38,12 @@ class EbuildHeader(LineCheck):
 		if num > 2:
 			return
 		elif num == 0:
-			if not self.gentoo_copyright_re.match(line):
+			match = self.gentoo_copyright_re.match(line)
+			if match is None:
+				return self.errors['COPYRIGHT_ERROR']
+			if not (match.group('author') == 'Gentoo Authors' or
+					(int(match.group('year2')) < 2019) and
+						match.group('author') == 'Gentoo Foundation'):
 				return self.errors['COPYRIGHT_ERROR']
 		elif num == 1 and line.rstrip('\n') != self.gentoo_license:
 			return self.errors['LICENSE_ERROR']
-- 
2.22.0