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 06b6f05f7118c8102160f8eb9e9c233af481b3cb..6447388ecd89c4a9d375b3e0a7374d9f72a21f04 100644 (file)
--- 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 66dab6113ccebdd2f6d748caa4fc405aecf5fc23..86691edc3eb9d53c80665df5992f0ff147b55fce 100755 (executable)
--- 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") != "":