X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride.py;h=3e8a9b4149ea7e9f7328534e171ea30283038c59;hb=3950b9877f066f4946d5ac1eec121913f9594142;hp=9e1735e87bee77bc537be2f29c50a1fde36d06c3;hpb=d758865e3e272e6bdb0d647622d36c4eb4692c5d;p=dak.git diff --git a/dak/override.py b/dak/override.py index 9e1735e8..3e8a9b41 100755 --- a/dak/override.py +++ b/dak/override.py @@ -229,18 +229,16 @@ 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: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia" + Subst["__CC__"] = "Cc: " + package + "@" + cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override" Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"] Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = utils.whoami()