[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/tests/simple/, repoman/lib/repoman/tests/changelog/, ...

[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/tests/simple/, repoman/lib/repoman/tests/changelog/, ...

[Michał Górny]

commit:     9f089d270503d18ee8800fe97f26c6644f20cac9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 09:07:55 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 17:18:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9f089d27

repoman: Automatically convert copyright to 'Gentoo Authors'

Automatically convert 'Gentoo Foundation' copyright to 'Gentoo Authors'
when updating the copyright date.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>

 repoman/lib/repoman/copyrights.py                      | 4 ++--
 repoman/lib/repoman/tests/changelog/test_echangelog.py | 2 +-
 repoman/lib/repoman/tests/simple/test_simple.py        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/repoman/lib/repoman/copyrights.py b/repoman/lib/repoman/copyrights.py
index 25627b3fc..1eaaab660 100644
--- a/repoman/lib/repoman/copyrights.py
+++ b/repoman/lib/repoman/copyrights.py
@@ -31,7 +31,7 @@ class _copyright_repl(object):
 			return matchobj.group(0)
 		else:
 			return matchobj.group(1) + matchobj.group(2) + \
-				b'-' + self.year + matchobj.group(3)
+				b'-' + self.year + b' Gentoo Authors'
 
 
 def update_copyright_year(year, line):
@@ -51,7 +51,7 @@ def update_copyright_year(year, line):
 	year = _unicode_encode(year)
 	line = _unicode_encode(line)
 
-	line = _copyright_re1.sub(br'\1-' + year + br'\2', line)
+	line = _copyright_re1.sub(br'\1-' + year + b' Gentoo Authors', line)
 	line = _copyright_re2.sub(_copyright_repl(year), line)
 	if not is_bytes:
 		line = _unicode_decode(line)

diff --git a/repoman/lib/repoman/tests/changelog/test_echangelog.py b/repoman/lib/repoman/tests/changelog/test_echangelog.py
index 1640be268..e5e34f16c 100644
--- a/repoman/lib/repoman/tests/changelog/test_echangelog.py
+++ b/repoman/lib/repoman/tests/changelog/test_echangelog.py
@@ -30,7 +30,7 @@ class RepomanEchangelogTestCase(TestCase):
 		os.makedirs(self.pkgdir)
 
 		self.header_pkg = '# ChangeLog for %s/%s\n' % (self.cat, self.pkg)
-		self.header_copyright = '# Copyright 1999-%s Gentoo Foundation; Distributed under the GPL v2\n' % \
+		self.header_copyright = '# Copyright 1999-%s Gentoo Authors; Distributed under the GPL v2\n' % \
 			time.strftime('%Y', time.gmtime())
 		self.header_cvs = '# $Header: $\n'
 

diff --git a/repoman/lib/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py
index 351dde2c7..b0cc43297 100644
--- a/repoman/lib/repoman/tests/simple/test_simple.py
+++ b/repoman/lib/repoman/tests/simple/test_simple.py
@@ -23,12 +23,12 @@ class SimpleRepomanTestCase(TestCase):
 			(
 				'2011',
 				'# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2',
-				'# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2',
+				'# Copyright 1999-2011 Gentoo Authors; Distributed under the GPL v2',
 			),
 			(
 				'2011',
 				'# Copyright 1999 Gentoo Foundation; Distributed under the GPL v2',
-				'# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2',
+				'# Copyright 1999-2011 Gentoo Authors; Distributed under the GPL v2',
 			),
 			(
 				'1999',