No longer use a seperate mail address for override things

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 07699a4dcda02036de8ecb2e38a93b441fc51e68..06b6f05f7118c8102160f8eb9e9c233af481b3cb 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -55,11 +55,6 @@ Generate-Index-Diffs
    };
 };
 
-Override
-{
-   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
-};
-
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";

diff --git a/dak/override.py b/dak/override.py
index ce35d925ff978fca8bcb11ff06942c06a9e5ed19..3e8a9b4149ea7e9f7328534e171ea30283038c59 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -229,13 +229,11 @@ def main ():
 
     if Options.has_key("Done"):
         Subst = {}
-        Subst["__OVERRIDE_ADDRESS__"] = cnf["Override::MyEmailAddress"]
+        Subst["__OVERRIDE_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"]
         Subst["__BUG_SERVER__"] = cnf["Dinstall::BugServer"]
         bcc = []
         if cnf.Find("Dinstall::Bcc") != "":
             bcc.append(cnf["Dinstall::Bcc"])
-        if cnf.Find("Override::Bcc") != "":
-            bcc.append(cnf["Override::Bcc"])
         if bcc:
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
         else: