diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-09-18 10:57:08 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-09-19 19:18:41 +0200 |
| commit | 2e6b40509dfffe8dd028dcc5d725a0ac9188d8b7 (patch) | |
| tree | de64dacb3cdc79bde0f8519ab16390f173384ca7 | |
| parent | repoman: Update header checks for the new copyright policy (diff) | |
| download | portage-2e6b40509dfffe8dd028dcc5d725a0ac9188d8b7.tar.gz portage-2e6b40509dfffe8dd028dcc5d725a0ac9188d8b7.tar.bz2 portage-2e6b40509dfffe8dd028dcc5d725a0ac9188d8b7.zip | |
repoman: Allow copyright updates for 'Gentoo Authors'
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Reviewed-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | repoman/lib/repoman/copyrights.py | 4 | ||||
| -rw-r--r-- | 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: |