From 2541a35644a2cb51de6d7d286b6f8a40d01e50f1 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 19 Sep 2010 18:03:58 +0200 Subject: [PATCH] No longer use a seperate mail address for override things Signed-off-by: Joerg Jaspert --- config/debian/dak.conf | 5 ----- dak/override.py | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) 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 "; -}; - 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: -- 2.39.5