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 43a67c6e670bccbe2ed460cfd4314dfc430bfe0f..1233ae09016bc252e0656030422ef7edbb221422 100644 (file)
--- 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 1da2734f75068f8501aed6f8042f1fc638161627..8462421bc07e40c6e622ae157266537c8e4bc806 100755 (executable)
--- 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