echangelog: Fix bazaar MOVED/MODIFIED, thanks to Serkan

Kaba <serkan@gentoo.org>, bug 315931.

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

diff --git a/ChangeLog b/ChangeLog
index b9c3c796526fbf0afc2e29a9011c7ee20ca731e0..39965ec91b4a982dafb046b291a64a94b39c2504 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-18: Christian Ruppert <idl0r@gentoo.org>
+       src/echangelog/echangelog: Fix bazaar MOVED/MODIFIED, thanks to Serkan
+       Kaba <serkan@gentoo.org>, bug 315931.
+
 2010-03-28: Christian Ruppert <idl0r@gentoo.org>
        src/imlate/imlate, src/imlate/imlate.1: Made imlate python 2.6/3 compatible.
        Fixed deprecated portdb.dbapi.mysettings to portdb.dbapi.settings.

diff --git a/src/echangelog/echangelog b/src/echangelog/echangelog
index b414b1fc6c35c1ccd8dda5338e23019a1d3b4b08..a43acd4f536ac769d09bedb10285bb53b202c8a6 100755 (executable)
--- a/src/echangelog/echangelog
+++ b/src/echangelog/echangelog
@@ -299,8 +299,8 @@ while (<C>) {
                        push(@files, $filename);
                        next;
                        }
-               # RENAMED/MOVED
-               elsif (/^R\s+(\S+) => (\S+)/) {
+               # RENAMED/MOVED/MODIFIED
+               elsif (/^RM?\s+(\S+) => (\S+)/) {
                        my ($old, $new) = ($1, $2);
                        $old =~ s/^([^\/]+\/){2}//;
                        $new =~ s/^([^\/]+\/){2}//;