X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=2e023b7e0e0043c8c9bc342ad3c70806cb7c7f10;hb=4c2f7648021d1db257d4630b25158718fef66b56;hp=1190d023f737a022f1d26f381d503987731dd993;hpb=5537d969662dd89432dbede1e985d17a7ac632ef;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index 1190d023..2e023b7e 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -338,7 +338,8 @@ def main ():
             carbon_copy.append(copy_to + "@" + cnf["Dinstall::BugServer"])
         elif copy_to == 'package':
             for package in arguments:
-                carbon_copy.append(package + "@" + cnf["Dinstall::PackagesServer"])
+                if cnf.has_key("Dinstall::PackagesServer"):
+                    carbon_copy.append(package + "@" + cnf["Dinstall::PackagesServer"])
                 if cnf.has_key("Dinstall::TrackingServer"):
                     carbon_copy.append(package + "@" + cnf["Dinstall::TrackingServer"])
         elif '@' in copy_to:
@@ -619,7 +620,10 @@ def main ():
         Subst_close_rm["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"]
         for bug in utils.split_args(Options["Done"]):
             Subst_close_rm["__BUG_NUMBER__"] = bug
-            mail_message = utils.TemplateSubst(Subst_close_rm,cnf["Dir::Templates"]+"/rm.bug-close")
+            if Options["Do-Close"]:
+                mail_message = utils.TemplateSubst(Subst_close_rm,cnf["Dir::Templates"]+"/rm.bug-close-with-related")
+            else:
+                mail_message = utils.TemplateSubst(Subst_close_rm,cnf["Dir::Templates"]+"/rm.bug-close")
             utils.send_mail(mail_message)
 
     # close associated bug reports
@@ -644,14 +648,16 @@ def main ():
             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_pkg
-        logfile.write("Also closing bug(s):")
-        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))
-        logfile.write("\n")
-        logfile822.write("\n")
+        other_bugs = bts.get_bugs('src', source_pkg, 'status', 'open')
+        if other_bugs:
+            logfile.write("Also closing bug(s):")
+            logfile822.write("Also-Bugs:")
+            for bug in other_bugs:
+                Subst_close_other["__BUG_NUMBER_ALSO__"] += str(bug) + "-done@" + cnf["Dinstall::BugServer"] + ","
+                logfile.write(" " + str(bug))
+                logfile822.write(" " + str(bug))
+            logfile.write("\n")
+            logfile822.write("\n")
         if source_pkg in wnpp.keys():
             logfile.write("Also closing WNPP bug(s):")
             logfile822.write("Also-WNPP:")
@@ -664,11 +670,11 @@ def main ():
                     logfile822.write(" " + str(bug))
             logfile.write("\n")
             logfile822.write("\n")
-              
+
         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")
     logfile.close()