[gentoo-commits] proj/portage:master commit in: pym/repoman/

["Zac Medico" <zmedico@gentoo.org>]

commit:     8dfd8582e31a17c3adda9cba0f41545620289e5a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 21:26:26 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 21:26:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8dfd8582

update_copyright: don't hardcode 1999 start year

We want repoman to be applicable to as many repositories as possible.
If necessary, we can add another layout.conf attribute that configures
the copyright start years for all files.

---
 pym/repoman/utilities.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index a3fdf12..7f7d62a 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -548,12 +548,13 @@ def update_copyright(fn_path, year, pretend):
 			new_header.append(line)
 			break
 
-		# these two regexes are taken from
-		# echangelog update_copyright()
+		# These two regexes are taken from echangelog
+		# update_copyright(), except that we don't hardcode
+		# 1999 here (in order to be more generic).
 		line = re.sub(r'^(# Copyright \d+) ',
 			r'\1-%s ' % year, line)
-		line = re.sub(r'^(# Copyright) \d\d\d\d-\d\d\d\d',
-			r'\1 1999-%s' % year, line)
+		line = re.sub(r'^(# Copyright \d\d\d\d)-\d\d\d\d',
+			r'\1-%s' % year, line)
 		new_header.append(line)
 
 	difflines = 0