From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SH3at-0002Zv-Af for garchives@archives.gentoo.org; Mon, 09 Apr 2012 01:40:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70751E08FE; Mon, 9 Apr 2012 01:40:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 40F98E08FE for ; Mon, 9 Apr 2012 01:40:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A576E1B4010 for ; Mon, 9 Apr 2012 01:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 419AEE542E for ; Mon, 9 Apr 2012 01:40:19 +0000 (UTC) From: "Christian Ruppert" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" Message-ID: <1333935496.927063bf2ecd6157ed48e304a94e36456d3ea4b3.idl0r@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: /, src/echangelog/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: ChangeLog src/echangelog/echangelog X-VCS-Directories: / src/echangelog/ X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert X-VCS-Revision: 927063bf2ecd6157ed48e304a94e36456d3ea4b3 X-VCS-Branch: gentoolkit-dev Date: Mon, 9 Apr 2012 01:40:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d458cf7d-615c-4a0d-b2ca-11787b63ddc4 X-Archives-Hash: f755cc92c68c355394effcb10aefc526 commit: 927063bf2ecd6157ed48e304a94e36456d3ea4b3 Author: Christian Ruppert gentoo org> AuthorDate: Mon Apr 9 01:38:16 2012 +0000 Commit: Christian Ruppert gentoo org> CommitDate: Mon Apr 9 01:38:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi= t;a=3Dcommit;h=3D927063bf Don't modify the initial copyright year when updating e.g. 1999-2012, bug= 380325. --- ChangeLog | 4 +++- src/echangelog/echangelog | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23418c7..80e6caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ 2011-03-24: Christian Ruppert * echangelog: Remove duplicate sort calls. Improve the VCS check by adding a fallback/default PATH in case $PATH = is - empty + empty. + Don't modify the initial copyright year when updating e.g. 1999-2012, + bug 380325. =20 2011-03-23: Christian Ruppert * echangelog: Fix update_copyright loop to check/update ebuilds again. diff --git a/src/echangelog/echangelog b/src/echangelog/echangelog index cf0659b..62bff9b 100755 --- a/src/echangelog/echangelog +++ b/src/echangelog/echangelog @@ -215,7 +215,7 @@ sub update_copyright { (my $year =3D $date) =3D~ s/.* //; =20 $t =3D~ s/^# Copyright \d+(?=3D )/$&-$year/m or - $t =3D~ s/^(# Copyright) \d+-(\d+)/$1 1999-$year/m; + $t =3D~ s/^(# Copyright) (\d+)-\d+/$1 $2-$year/m; =20 return $t; }