Merging upstream version 1.22.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 5c75014..f6d7879 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -116,13 +116,14 @@ my @b = reverse @$chb;
 my @result; # Lines to output
 my $exitcode = 0; # 1 if conflict encountered
 
-unless (merge_block($cho, $cha, $chb, sub {
-			my $changes = shift;
-			my $tail = $changes->get_unparsed_tail();
-			chomp $tail if defined $tail;
-			return $tail;
-		    }))
-{
+sub merge_tail {
+    my $changes = shift;
+    my $tail = $changes->get_unparsed_tail();
+    chomp $tail if defined $tail;
+    return $tail;
+};
+
+unless (merge_block($cho, $cha, $chb, \&merge_tail)) {
     merge_conflict($cha->get_unparsed_tail(), $chb->get_unparsed_tail());
 }