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

[Christian Ruppert]

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

Fix sorting again, bug 336390

---
 src/echangelog/echangelog |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/echangelog/echangelog b/src/echangelog/echangelog
index 94f045e..273c5db 100755
--- a/src/echangelog/echangelog
+++ b/src/echangelog/echangelog
@@ -612,12 +612,8 @@ if (($vcs eq "svn" or $vcs eq "hg") and (@ebuilds)) {
 # not.  Trim them from @new_versions in that case.
 @new_versions = grep { $text !~ /^\*\Q$_\E\s/m } @new_versions;
 
-# Check if we have any files left, otherwise re-insert ebuild list
-# (of course, both might be empty anyway)
-@files = @ebuilds unless (@files);
-
 # Allow ChangeLog entries with no changed files, but give a fat warning
-unless (@files) {
+if (!@files && !@ebuilds) {
 	print STDERR "**\n";
 	print STDERR "** NOTE: No non-trivial changed files found. Normally echangelog\n";
 	print STDERR "** should be run after all affected files have been added and/or\n";
@@ -718,7 +714,13 @@ else {
 die "Please set ECHANGELOG_USER or run as non-root\n" if $user =~ /<root@/;
 
 $entry = "$date; $user ";
-$entry .= join ', ', sort sortfunc map("$actions{$_}$_", @files);
+if(@ebuilds) {
+	$entry .= join(', ', sort sortfunc map("$actions{$_}$_", @ebuilds));
+	$entry .= ", ".join(', ', sort sortfunc map("$actions{$_}$_", @files)) if @files;
+}
+else {
+	$entry .= join ', ', sort sortfunc map("$actions{$_}$_", @files);
+}
 $entry .= ':';
 $entry = Text::Wrap::fill('  ', '  ', $entry); # does not append a \n
 $entry .= "\n$input";                          # append user input