[buildd-tools-devel] Bug#627854: buildd: Please drop trailing empty line from .changes

[Samuel Thibault]

Package: buildd
Version: 0.62.3-1
Severity: normal
Tags: patch

Hello,

ftp-master started refusing .changes files which have a trailing empty
line (after the GPG end of signature). It happens that mutt introduces
one when signing GPG in traditional mode. Other tools probably do too.
buildd-mail-wrapper should probably drop it automatically, see attached
patch.

Samuel

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel Thibault <samuel.thibault at fnac.net>
* x remarque qu'avec un peu de volonté, on peut faire du code de porc
dans d'importe quel langage Turing-complet
 -+- x sur #ens-mim - codons porc -+-
-------------- next part --------------
diff --git a/lib/Buildd/Mail.pm b/lib/Buildd/Mail.pm
index b5b343b..cff1880 100644
--- a/lib/Buildd/Mail.pm
+++ b/lib/Buildd/Mail.pm
@@ -478,6 +478,8 @@ sub prepare_for_upload ($$) {
     my $pkg = shift;
     my $changes = shift;
 
+    $changes =~ s/\n+$/\n/;
+
     my( @files, @md5, @missing, @md5fail, $i );
 
     my @to_dists = $self->get_dists_from_changes( $changes );