Sigh, I should test a bit more thoroughly occasionally

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

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 97359b0f8b540099e9dd546cb28a0550d62fee23..0dd57a4cb71117bc7dbd42ba8f5a5345e287d756 100755 (executable)
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -2124,15 +2124,16 @@ sub send_mail($$$) {
        my $subject = shift;
        my $text = shift;
 
-        my $package = join(' ', keys %main::packages);
+        my $package = keys %main::packages ? join(' ', keys %main::packages) : "";
 
         use Email::Send;
+        $Email::Send::Sendmail::SENDMAIL = '/usr/sbin/sendmail';
 
-        my $message = <<'__MESSAGE__';
-        To: $addr
-        From: dak@ftp-master.debian.org
-        Subject: $subject
-        X-Debian: DAK
+        my $message = <<__MESSAGE__;
+To: $addr
+From: dak\@ftp-master.debian.org
+Subject: $subject
+X-Debian: DAK
 __MESSAGE__
 
         if (length $package) {
@@ -2147,7 +2148,7 @@ __MESSAGE__
         }
 
         my $ret = $mail->send($message);
-        if ($ret && $ret !~ /Message sent/) {
+        if ($ret && $ret !~ /Message sent|success/) {
             return 0;
         }