X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Fdebianqueued-0.9%2Fdebianqueued;h=c4dec406b82b789fa8e4f982f1930c35a3238cd7;hb=e45a525a77d3f3007b983b9dc6c3ec713a6a5a2a;hp=6d971826df6ccb3ddcc7373ca937fdfcb4c42479;hpb=6f505a1856573665419aa3330f4f9835a1dcf4bf;p=dak.git

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 6d971826..c4dec406 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -2124,34 +2124,36 @@ sub send_mail($$$) {
 	my $subject = shift;
 	my $text = shift;
 
-        my $package = keys %main::packages ? join(' ', keys %main::packages) : "";
+	my $package = keys %main::packages ? join(' ', keys %main::packages) : "";
 
-        use Email::Send;
+	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) {
-            $message .= "X-Debian-Package: $package\n";
-        }
+	if (length $package) {
+		$message .= "X-Debian-Package: $package\n";
+	}
 
-        $message .= "\n$text";
+	$message .= "\n$text";
+	$message .= "\nGreetings,\n\n\tYour Debian queue daemon\n";
 
-        my $mail = Email::Send->new;
-        for ( qw[Sendmail SMTP] ) {
-            $mail->mailer($_) and last if $mail->mailer_available($_);
-        }
+	my $mail = Email::Send->new;
+	for ( qw[Sendmail SMTP] ) {
+		$mail->mailer($_) and last if $mail->mailer_available($_);
+	}
 
-        my $ret = $mail->send($message);
-        if ($ret && $ret !~ /Message sent/) {
-            return 0;
-        }
+	my $ret = $mail->send($message);
+	if ($ret && $ret !~ /Message sent|success/) {
+		return 0;
+	}
 
-        return 1;
+	return 1;
 }
 
 #