[dak/master] No longer use a seperate mail address for override things

[Joerg Jaspert <joerg@debian.org>]

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian/dak.conf |    5 -----
 dak/override.py        |    4 +---
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 07699a4..06b6f05 100644
--- 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 ce35d92..3e8a9b4 100755
--- 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:
-- 
1.5.6.5