X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=66dab6113ccebdd2f6d748caa4fc405aecf5fc23;hb=cac810b4aeb8fa34c8ccaa7dc35b081efddc606b;hp=c0f6810dd1baf27233ae32760897203d225c4031;hpb=64d62bfb23973c73c968b8759cbaddf97ced1ddc;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index c0f6810d..66dab611 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"):
@@ -623,6 +623,8 @@ def main ():
             utils.send_mail(mail_message)
 
     # close associated bug reports
+    # FIXME:  We should also close possible WNPP bugs for that package, but
+    # currently there's no sane way to determine them
     if Options["Do-Close"]:
         if len(versions) == 1:
             Subst["__VERSION__"] = versions[0]
@@ -633,10 +635,15 @@ def main ():
         # at this point, I just assume, that the first closed bug gives
         # some usefull information on why the package got removed
         Subst["__BUG_NUMBER__"] = utils.split_args(Options["Done"])[0]
-        for bug in bts.get_bugs('src', package, 'status', 'open'):
-            Subst["__BUG_NUMBER_ALSO__"] += bug + "-done@" + cnf["Dinstall::BugServer"] + ","
+        if len(sources) > 1:
+            utils.fubar("Closing bugs for multiple source pakcages is not supported.  Do it yourself.")
+        Subst["__BUG_NUMBER_ALSO__"] = ""
+        Subst["__SOURCE__"] = source.split("_", 1)[0]
+        for bug in bts.get_bugs('src', source.split("_", 1)[0], 'status', 'open'):
+            Subst["__BUG_NUMBER_ALSO__"] += str(bug) + "-done@" + cnf["Dinstall::BugServer"] + ","
         mail_message = utils.TemplateSubst(Subst,cnf["Dir::Templates"]+"/rm.bug-close-related")
-        utils.send_mail(mail_message)
+        if Subst["__BUG_NUMBER_ALSO__"]:
+            utils.send_mail(mail_message)
 
 #######################################################################################