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 ddce96920c45b73add7b903c0612b1c03e2b9668..26c1c8b8bd33c5a0fc30480468c82991cefbcd12 100644 (file)
--- 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 c7e66a4e80dabef4128314b587e55aef8916aeec..e39b72d690e0a85d46db6b1fe8808d0ccc04aecf 100755 (executable)
--- 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