From: Joerg Jaspert <joerg@debian.org> Date: Sun, 19 Sep 2010 16:07:16 +0000 (+0200) Subject: Use the global mail address for RM X-Git-Tag: debian-r/squeeze~539 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ef5bc2b8a8ad457c923df2ea139867e814832659;p=dak.git Use the global mail address for RM Signed-off-by: Joerg Jaspert <joerg@debian.org> --- diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 06b6f05f..6447388e 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -101,7 +101,6 @@ Rm Suite "unstable"; }; - MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>"; LogFile "/srv/ftp.debian.org/web/removals.txt"; LogFile822 "/srv/ftp.debian.org/web/removals.822"; Bcc "removed-packages@qa.debian.org"; diff --git a/dak/rm.py b/dak/rm.py index 66dab611..86691edc 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -588,7 +588,7 @@ def main (): print "done." Subst = {} - Subst["__RM_ADDRESS__"] = cnf["Rm::MyEmailAddress"] + Subst["__RM_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"] Subst["__BUG_SERVER__"] = cnf["Dinstall::BugServer"] bcc = [] if cnf.Find("Dinstall::Bcc") != "":