Merge branch 'master' of git://git.debian.org/git/users/otavio/dak into small_fixes

[dak.git] / tools / debianqueued-0.9 / debianqueued

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index d58889f057e05a1afc44a4ac262fed0c131cc459..07f378446d3b998e5fe47455d0f345c51314b1da 100755 (executable)
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -241,7 +241,7 @@
 require 5.002;
 use strict;
 use POSIX;
-use POSIX qw( sys_stat_h sys_wait_h signal_h );
+use POSIX qw( strftime sys_stat_h sys_wait_h signal_h );
 use Net::Ping;
 use Net::FTP;
 use Socket qw( PF_INET AF_INET SOCK_STREAM );
@@ -1169,6 +1169,8 @@ sub process_commands($) {
 
        if ($pgplines < 3) {
                msg( "log,mail", "$commands isn't signed with PGP/GnuPG\n" );
+               msg( "mail", "or the uploaded file is broken. Make sure to transfer in binary mode\n" );
+               msg( "mail", "or better yet - use dcut for commands files\n");
                goto remove;
        }
        
@@ -2132,10 +2134,12 @@ sub send_mail($$$) {
                $Email::Send::Sendmail::SENDMAIL = $conf::mail;
        }
 
+       my $date = sprintf "%s", strftime("%a, %d %B %Y %T %z", (localtime(time)));
        my $message = <<__MESSAGE__;
 To: $addr
 From: Archive Administrator <dak\@ftp-master.debian.org>
 Subject: $subject
+Date: $date
 X-Debian: DAK
 __MESSAGE__