From: idl0r <idl0r@gentoo.org>
Date: Sat, 23 Oct 2010 15:14:42 +0000 (-0000)
Subject: echangelog: Sort files properly, bug 336390, thanks to Michał Górny
X-Git-Tag: gentoolkit-dev-0.2.8~13
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=31f98f9d7ac2c407676c6e7e3d58183d416dd64a;p=gentoolkit.git

echangelog: Sort files properly, bug 336390, thanks to Michał Górny
<mgorny@gentoo.org>.

svn path=/trunk/gentoolkit-dev/; revision=819
---

diff --git a/ChangeLog b/ChangeLog
index 43a67c6..1233ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-10-23: Christian Ruppert <idl0r@gentoo.org>
 	* echangelog: Fix version bump detection for hg/mercurial, bug 335636,
 		thanks to Mike Gilbert <floppymaster@gmail.com>.
+		Sort files properly, bug 336390, thanks to Michał Górny
+		<mgorny@gentoo.org>.
 
 2010-10-19: Christian Ruppert <idl0r@gentoo.org>
 	* eshowkw: Apply a patch from Mart Raudsepp <leio@gentoo.org> to speedup
diff --git a/src/echangelog/echangelog b/src/echangelog/echangelog
index 1da2734..8462421 100755
--- a/src/echangelog/echangelog
+++ b/src/echangelog/echangelog
@@ -709,7 +709,7 @@ die "Please set ECHANGELOG_USER or run as non-root\n" if $user =~ /<root@/;
 
 $date = strftime("%d %b %Y", gmtime);
 $entry = "$date; $user ";
-$entry .= join ', ', map "$actions{$_}$_", @files;
+$entry .= join ', ', sort sortfunc map("$actions{$_}$_", @files);
 $entry .= ':';
 $entry = Text::Wrap::fill('  ', '  ', $entry); # does not append a \n
 $entry .= "\n$input";                          # append user input