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

* tolimar/rm-close-bugs:
  Make the wnpp parse more robust for missing files
  Only log, if there is something to log
  Make it the qa wnpp list download more fault tolerant
  Fix comment of cron.daily (copy and paste from cron.monthly)
  Use different mail templates to close removal bugs, if related bugs got closed
  Refresh the wnpp bugs list on a daily basis
  Also close wnpp bugs on package removal

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index b9dd0a558cc9c1e20b09f4fc8e08168b320205bf..57f839d730d8e9a417b500508acde3b76d6cb02a 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -32,7 +32,7 @@ Dinstall
    SkipTime 300;
    // If defined then mails to close bugs are sent to the bugserver.
    CloseBugs "false";
-   OverrideDisparityCheck "true";
+   OverrideDisparityCheck "false";
    DefaultSuite "lenny-backports";
    Reject
    {

diff --git a/dak/rm.py b/dak/rm.py
index 936468cf2c8e2dfbae1e2944ff2e972b6cb2cc46..7377f23b5b7236382e67d002005e71ac0932d800 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -669,11 +669,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()

diff --git a/daklib/utils.py b/daklib/utils.py
index 4744f6a2f214dd7cbf67aee9a5b4cae54c604a7a..7ed4089a4dd2610a09a7c5f7a3852eda987b5456 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1548,7 +1548,7 @@ def parse_wnpp_bug_file(file = "/srv/ftp-master.debian.org/scripts/masterfiles/w
     returns a dict associating source package name with a list of open wnpp
     bugs (Yes, there might be more than one)
     """
-    
+
     line = []
     try:
         f = open(file)
@@ -1571,4 +1571,3 @@ def parse_wnpp_bug_file(file = "/srv/ftp-master.debian.org/scripts/masterfiles/w
                 bugs.append(bug_no)
         wnpp[source] = bugs
     return wnpp
-

diff --git a/templates/rm.bug-close-with-related b/templates/rm.bug-close-with-related
index 6a8f8c831bbcb641dd5ce0df794329f215370fa9..0dcc1b41d816bad557642fbf3ee0016d59f8e56a 100644 (file)
--- a/templates/rm.bug-close-with-related
+++ b/templates/rm.bug-close-with-related
@@ -1,6 +1,6 @@
 From: __RM_ADDRESS__
 To: __BUG_NUMBER__-close@__BUG_SERVER__
-__CC__ 
+__CC__
 __BCC__
 X-Debian: DAK
 MIME-Version: 1.0