X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=f4452c6f0c8042aad080859df367b4e139c0308c;hb=9f523eb071132709bcb68234f9a8bd7c22d3565c;hp=f0d18c1d12da2acf615de39cc690b0b6f45c60e9;hpb=7f4d35fbb32109cc31edc50b054035e133e4bb52;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index f0d18c1d..f4452c6f 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -283,7 +283,7 @@ def main ():
 
     for i in [ "architecture", "binary-only", "carbon-copy", "component",
                "done", "help", "no-action", "partial", "rdep-check", "reason",
-               "source-only" ]:
+               "source-only", "Do-Close" ]:
         if not cnf.has_key("Rm::Options::%s" % (i)):
             cnf["Rm::Options::%s" % (i)] = ""
     if not cnf.has_key("Rm::Options::Suite"):
@@ -588,17 +588,9 @@ def main ():
     print "done."
 
     Subst = {}
-    Subst["__RM_ADDRESS__"] = cnf["Rm::MyEmailAddress"]
+    Subst["__RM_ADDRESS__"] = cnf["Dinstall::MyEmailAddress"]
     Subst["__BUG_SERVER__"] = cnf["Dinstall::BugServer"]
     bcc = []
-    if cnf.Find("Dinstall::Bcc") != "":
-        bcc.append(cnf["Dinstall::Bcc"])
-    if cnf.Find("Rm::Bcc") != "":
-        bcc.append(cnf["Rm::Bcc"])
-    if bcc:
-        Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
-    else:
-        Subst["__BCC__"] = "X-Filler: 42"
     Subst["__CC__"] = "X-DAK: dak rm"
     if carbon_copy:
         Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
@@ -610,6 +602,14 @@ def main ():
 
     # Send the bug closing messages
     if Options["Done"]:
+        if cnf.Find("Dinstall::Bcc") != "":
+            bcc.append(cnf["Dinstall::Bcc"])
+        if cnf.Find("Rm::Bcc") != "":
+            bcc.append(cnf["Rm::Bcc"])
+        if bcc:
+            Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
+        else:
+            Subst["__BCC__"] = "X-Filler: 42"
         summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (summary, Options["Reason"])
         summarymail += "----------------------------------------------\n"
         Subst["__SUMMARY__"] = summarymail
@@ -630,6 +630,10 @@ def main ():
             Subst["__VERSION__"] = versions[0]
         else:
             utils.fubar("Closing bugs with multiple package versions is not supported.  Do it yourself.")
+        if bcc:
+            Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
+        else:
+            Subst["__BCC__"] = "X-Filler: 42"
         whereami = utils.where_am_i()
         Archive = cnf.SubTree("Archive::%s" % (whereami))
         # at this point, I just assume, that the first closed bug gives