commit: 2e6b40509dfffe8dd028dcc5d725a0ac9188d8b7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 08:57:08 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 17:18:41 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e6b4050
repoman: Allow copyright updates for 'Gentoo Authors'
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/simple/test_simple.py | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/repoman/lib/repoman/copyrights.py
b/repoman/lib/repoman/copyrights.py
index 94257c942..25627b3fc 100644
--- a/repoman/lib/repoman/copyrights.py
+++ b/repoman/lib/repoman/copyrights.py
@@ -15,9 +15,9 @@ from portage import util
_copyright_re1 = \
- re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d( Gentoo Foundation)\b')
+ re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d( Gentoo
(Foundation|Authors))\b')
_copyright_re2 = \
- re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo Foundation)\b')
+ re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo
(Foundation|Authors))\b')
class _copyright_repl(object):
diff --git a/repoman/lib/repoman/tests/simple/test_simple.py
b/repoman/lib/repoman/tests/simple/test_simple.py
index 3d7a70ad0..351dde2c7 100644
--- a/repoman/lib/repoman/tests/simple/test_simple.py
+++ b/repoman/lib/repoman/tests/simple/test_simple.py
@@ -35,6 +35,16 @@ class SimpleRepomanTestCase(TestCase):
'# Copyright 1999 Gentoo Foundation;
Distributed under the GPL v2',
'# Copyright 1999 Gentoo Foundation;
Distributed under the GPL v2',
),
+ (
+ '2018',
+ '# Copyright 1999-2008 Gentoo Authors;
Distributed under the GPL v2',
+ '# Copyright 1999-2018 Gentoo Authors;
Distributed under the GPL v2',
+ ),
+ (
+ '2018',
+ '# Copyright 2017 Gentoo Authors; Distributed
under the GPL v2',
+ '# Copyright 2017-2018 Gentoo Authors;
Distributed under the GPL v2',
+ ),
)
for year, before, after in test_cases:
