1 |
--- |
2 |
repoman/lib/repoman/copyrights.py | 4 ++-- |
3 |
repoman/lib/repoman/tests/simple/test_simple.py | 10 ++++++++++ |
4 |
2 files changed, 12 insertions(+), 2 deletions(-) |
5 |
|
6 |
diff --git a/repoman/lib/repoman/copyrights.py b/repoman/lib/repoman/copyrights.py |
7 |
index 94257c942..25627b3fc 100644 |
8 |
--- a/repoman/lib/repoman/copyrights.py |
9 |
+++ b/repoman/lib/repoman/copyrights.py |
10 |
@@ -15,9 +15,9 @@ from portage import util |
11 |
|
12 |
|
13 |
_copyright_re1 = \ |
14 |
- re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d( Gentoo Foundation)\b') |
15 |
+ re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d( Gentoo (Foundation|Authors))\b') |
16 |
_copyright_re2 = \ |
17 |
- re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo Foundation)\b') |
18 |
+ re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo (Foundation|Authors))\b') |
19 |
|
20 |
|
21 |
class _copyright_repl(object): |
22 |
diff --git a/repoman/lib/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py |
23 |
index 3d7a70ad0..351dde2c7 100644 |
24 |
--- a/repoman/lib/repoman/tests/simple/test_simple.py |
25 |
+++ b/repoman/lib/repoman/tests/simple/test_simple.py |
26 |
@@ -35,6 +35,16 @@ class SimpleRepomanTestCase(TestCase): |
27 |
'# Copyright 1999 Gentoo Foundation; Distributed under the GPL v2', |
28 |
'# Copyright 1999 Gentoo Foundation; Distributed under the GPL v2', |
29 |
), |
30 |
+ ( |
31 |
+ '2018', |
32 |
+ '# Copyright 1999-2008 Gentoo Authors; Distributed under the GPL v2', |
33 |
+ '# Copyright 1999-2018 Gentoo Authors; Distributed under the GPL v2', |
34 |
+ ), |
35 |
+ ( |
36 |
+ '2018', |
37 |
+ '# Copyright 2017 Gentoo Authors; Distributed under the GPL v2', |
38 |
+ '# Copyright 2017-2018 Gentoo Authors; Distributed under the GPL v2', |
39 |
+ ), |
40 |
) |
41 |
|
42 |
for year, before, after in test_cases: |
43 |
-- |
44 |
2.19.0 |