From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 19 Sep 2010 13:44:11 +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=cac9d5c910d0c145c868df431654c32ef927ae3a;hp=2dbc6c7983dbbe935e0f4c2147448dae7d41b6c5;p=dak.git

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

* tolimar/rm-close-bugs:
  Fix key error if do-close isn't set
  Add some debugging output

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

diff --git a/dak/rm.py b/dak/rm.py
index c0f6810d..e7dbde64 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"):
@@ -633,8 +633,11 @@ 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]
+        print "Package:", package
+        print "Bugs found:", bts.get_bugs('src', package, 'status', 'open')
         for bug in bts.get_bugs('src', package, 'status', 'open'):
             Subst["__BUG_NUMBER_ALSO__"] += bug + "-done@" + cnf["Dinstall::BugServer"] + ","
+	print "Resulting to:", Subst["__BUG_NUMBER_ALSO__"]
         mail_message = utils.TemplateSubst(Subst,cnf["Dir::Templates"]+"/rm.bug-close-related")
         utils.send_mail(mail_message)