From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 19 Sep 2010 16:03:58 +0000 (+0200)
Subject: No longer use a seperate mail address for override things
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2541a35644a2cb51de6d7d286b6f8a40d01e50f1;p=dak

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 07699a4d..06b6f05f 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 ce35d925..3e8a9b41 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: