ftpmaster-dak r1092: Merge mailtags again
------------------------------------------------------------
revno: 1092
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sat 2008-05-10 20:43:10 +0200
message:
Merge mailtags again
modified:
tools/debianqueued-0.9/config
tools/debianqueued-0.9/debianqueued
------------------------------------------------------------
revno: 1090.1.6
committer: Stephen Gran <steve@lobefin.net>
branch nick: ftpmaster-dak-mail
timestamp: Sat 2008-05-10 19:08:15 +0100
message:
Quiet perl warnings. Ganneff: this means changing config - I tried to stay
away from that the first time around, since I wanted to ignore some values
that no longer matter, but now I'm reusing them so we don't get 'variable
only used once' warnings.
modified:
tools/debianqueued-0.9/config
tools/debianqueued-0.9/debianqueued
------------------------------------------------------------
revno: 1090.1.7
committer: Stephen Gran <steve@lobefin.net>
branch nick: ftpmaster-dak-mail
timestamp: Sat 2008-05-10 19:38:54 +0100
message:
Readd 'Archive Administrator' at Ganneff's request (picky, picky, picky)
modified:
tools/debianqueued-0.9/debianqueued
------------------------------------------------------------
revno: 1090.2.2
committer: Joerg Jaspert <joerg@debian.org>
branch nick: mailtags
timestamp: Sat 2008-05-10 20:42:50 +0200
message:
Merge from sgran
modified:
tools/debianqueued-0.9/config
tools/debianqueued-0.9/debianqueued
=== modified file 'tools/debianqueued-0.9/config'
--- a/tools/debianqueued-0.9/config 2008-04-25 18:18:37 +0000
+++ b/tools/debianqueued-0.9/config 2008-05-10 18:08:15 +0000
@@ -73,7 +73,7 @@
$ssh_agent = "/usr/bin/ssh-agent";
$ssh_add = "/usr/bin/ssh-add";
$md5sum = "/usr/bin/md5sum";
-$mail = "/usr/bin/mail";
+$mail = "/usr/sbin/sendmail";
$mkfifo = "/usr/bin/mkfifo";
$tar = "/bin/tar"; # must be GNU tar!
$gzip = "/bin/gzip";
=== modified file 'tools/debianqueued-0.9/debianqueued'
--- a/tools/debianqueued-0.9/debianqueued 2008-05-10 17:43:11 +0000
+++ b/tools/debianqueued-0.9/debianqueued 2008-05-10 18:38:54 +0000
@@ -276,6 +276,7 @@
$junk = @conf::nonus_packages;
$junk = @conf::test_binaries;
$junk = @conf::maintainer_mail;
+$junk = $conf::mail ||= '/usr/sbin/sendmail';
$conf::target = "localhost" if $conf::upload_method eq "copy";
package main;
@@ -2090,7 +2091,6 @@
# then send out
#
sub finish_mail() {
- local( *MAIL );
debug( "No mail for $main::mail_addr" )
if $main::mail_addr && !$main::mail_text;
@@ -2127,11 +2127,14 @@
my $package = keys %main::packages ? join(' ', keys %main::packages) : "";
use Email::Send;
- $Email::Send::Sendmail::SENDMAIL = '/usr/sbin/sendmail';
+
+ unless (defined($Email::Send::Sendmail::SENDMAIL)) {
+ $Email::Send::Sendmail::SENDMAIL = $conf::mail;
+ }
my $message = <<__MESSAGE__;
To: $addr
-From: dak\@ftp-master.debian.org
+From: Archive Administrator <dak\@ftp-master.debian.org>
Subject: $subject
X-Debian: DAK
__MESSAGE__
Reply to: