From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 19 Nov 2009 07:53:15 +0000 (+0100)
Subject: Merge remote branch 'twerner/msfl' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bfb0bebe865f73949ff67c0156fdd9d63282c318;hp=e2f61f1e5f94ef361dd5bae888a68c80f8f56291;p=dak.git

Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  Really replace msfl by dominate in dinstall
  NEW

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

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index ddce9692..26c1c8b8 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -129,9 +129,9 @@ function cruft() {
     dak check-overrides
 }
 
-function msfl() {
-    log "Generating suite file lists for apt-ftparchive"
-    dak make-suite-file-list
+function dominate() {
+    log "Removing obsolete source and binary associations"
+    dak dominate
 }
 
 function filelist() {
diff --git a/daklib/queue.py b/daklib/queue.py
index c7e66a4e..e39b72d6 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2139,6 +2139,7 @@ distribution."""
             user_email_address = utils.whoami() + " <%s>" % (cnf["Dinstall::MyAdminAddress"])
             self.Subst["__REJECTOR_ADDRESS__"] = user_email_address
             self.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
+            self.Subst["__REJECT_MESSAGE__"] = ""
             self.Subst["__CC__"] = "Cc: " + cnf["Dinstall::MyEmailAddress"]
             reject_mail_message = utils.TemplateSubst(self.Subst, rej_template)
             # Write the rejection email out as the <foo>.reason file