From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 27 Sep 2010 19:45:23 +0000 (+0200)
Subject: Merge remote branch 'tolimar/rm-close-bugs' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=86ac396f89d59125db98b6e803471cf8529a615d;hp=0a7deb341cf4df4e779b398aba2804e5fe064c1d;p=dak.git

Merge remote branch 'tolimar/rm-close-bugs' into merge

* tolimar/rm-close-bugs:
  Log which bugs got closes

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

diff --git a/dak/rm.py b/dak/rm.py
index 11ec6c9e..db43de19 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -494,6 +494,8 @@ def main ():
         print "Will also close bugs: "+Options["Done"]
     if carbon_copy:
         print "Will also send CCs to: " + ", ".join(carbon_copy)
+    if Options["Do-Close"]:
+        print "Will also close associated bug reports."
     print
     print "------------------- Reason -------------------"
     print Options["Reason"]
@@ -523,8 +525,6 @@ def main ():
         logfile.write("Closed bugs: %s\n" % (Options["Done"]))
     logfile.write("\n------------------- Reason -------------------\n%s\n" % (Options["Reason"]))
     logfile.write("----------------------------------------------\n")
-    logfile.write("=========================================================================\n")
-    logfile.close()
 
     # Do the same in rfc822 format
     logfile822 = utils.open_file(cnf["Rm::LogFile822"], 'a')
@@ -553,8 +553,6 @@ def main ():
     logfile822.write("Reason: %s\n" % Options["Reason"].replace('\n', '\n '))
     if Options["Done"]:
         logfile822.write("Bug: %s\n" % Options["Done"])
-    logfile822.write("\n")
-    logfile822.close()
 
     dsc_type_id = get_override_type('dsc', session).overridetype_id
     deb_type_id = get_override_type('deb', session).overridetype_id
@@ -639,17 +637,29 @@ def main ():
         else:
             Subst_close_other["__BCC__"] = "X-Filler: 42"
         # at this point, I just assume, that the first closed bug gives
-        # some usefull information on why the package got removed
+        # some useful information on why the package got removed
         Subst_close_other["__BUG_NUMBER__"] = utils.split_args(Options["Done"])[0]
         if len(sources) > 1:
             utils.fubar("Closing bugs for multiple source pakcages is not supported.  Do it yourself.")
         Subst_close_other["__BUG_NUMBER_ALSO__"] = ""
         Subst_close_other["__SOURCE__"] = source.split("_", 1)[0]
+        logfile.write("Also closing bugs: ")
+        logfile822.write("Also-Bugs: ")
         for bug in bts.get_bugs('src', source.split("_", 1)[0], 'status', 'open'):
             Subst_close_other["__BUG_NUMBER_ALSO__"] += str(bug) + "-done@" + cnf["Dinstall::BugServer"] + ","
+            logfile.write(" " + str(bug))
+            logfile822.write(" " + str(bug))
         mail_message = utils.TemplateSubst(Subst_close_other,cnf["Dir::Templates"]+"/rm.bug-close-related")
         if Subst_close_other["__BUG_NUMBER_ALSO__"]:
             utils.send_mail(mail_message)
+        logfile.write("\n")
+        logfile822.write("\n")
+
+    logfile.write("=========================================================================\n")
+    logfile.close()
+
+    logfile822.write("\n")
+    logfile822.close()
 
 #######################################################################################