[gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: src/echangelog/

[Christian Ruppert]

commit:     2f5229064ec75704c257053510df376689dd10b0
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 20:10:44 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 20:10:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=2f522906

Use update_cat_pn() and update_copyright() only once for the ChangeLog, right after loading it

---
 src/echangelog/echangelog |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/echangelog/echangelog b/src/echangelog/echangelog
index 06fc33e..fe21729 100755
--- a/src/echangelog/echangelog
+++ b/src/echangelog/echangelog
@@ -282,13 +282,21 @@ if (-f 'ChangeLog') {
 		close(I);
 
 		$text =~ s/^\*.*//ms; # don't need the fake entry
-
-		$text = update_cat_pn($text);
 	} else {
 		die "This should be run in a directory with ebuilds...\n";
 	}
 }
 
+# Update the copyright year in the ChangeLog
+$text = update_copyright($text);
+
+# New packages and/or ones that have moved around often have stale data here.
+# But only do that in places where ebuilds are around (as echangelog can be
+# used in profiles/ and such places).
+if (<*.ebuild>) {
+	$text = update_cat_pn($text);
+}
+
 # Figure out what has changed around here
 open C, $vcs{$vcs}{status}.' 2>&1 |' or die "Can't run ".$vcs{$vcs}{status}.": $!\n";
 while (<C>) {
@@ -737,16 +745,6 @@ if (@new_versions) {
 			or die "Failed to insert new entry (3)\n";
 }
 
-# New packages and/or ones that have moved around often have stale data here.
-# But only do that in places where ebuilds are around (as echangelog can be
-# used in profiles/ and such places).
-if (grep(/\.ebuild$/, @files)) {
-	$text = update_cat_pn($text);
-}
-
-# Update the copyright year in the ChangeLog
-$text = update_copyright($text);
-
 # Write the new ChangeLog
 open O, '>ChangeLog.new' or die "Can't open ChangeLog.new for output: $!\n";
 print O $text            or die "Can't write ChangeLog.new: $!\n";