Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/
Date: Wed, 01 Mar 2017 19:22:29
Message-Id: 1488395835.36cccbbf3f4613e177d2fb735c8f6ddc73799eba.dolsen@gentoo
1 commit: 36cccbbf3f4613e177d2fb735c8f6ddc73799eba
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 1 19:17:15 2017 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 1 19:17:15 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=36cccbbf
7
8 repoman: Fix regular expressions matching the copyright line
9
10 Fixes commit: d38405be3e0d2
11 The previous commit broke copyright updating for Changelogs which
12 have the license on the same line.
13
14 repoman/pym/repoman/copyrights.py | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/repoman/pym/repoman/copyrights.py b/repoman/pym/repoman/copyrights.py
18 index 7a36ff30d..94257c942 100644
19 --- a/repoman/pym/repoman/copyrights.py
20 +++ b/repoman/pym/repoman/copyrights.py
21 @@ -15,9 +15,9 @@ from portage import util
22
23
24 _copyright_re1 = \
25 - re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d( Gentoo Foundation)$')
26 + re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d( Gentoo Foundation)\b')
27 _copyright_re2 = \
28 - re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo Foundation)$')
29 + re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo Foundation)\b')
30
31
32 class _copyright_repl(object):