[dak/master] add per-suite close_bugs option

[Ansgar Burchardt <ansgar@debian.org>]

---
 dak/dakdb/update85.py |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 dak/update_db.py      |    2 +-
 daklib/announce.py    |    4 +++-
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 dak/dakdb/update85.py

diff --git a/dak/dakdb/update85.py b/dak/dakdb/update85.py
new file mode 100644
index 0000000..2f0079d
--- /dev/null
+++ b/dak/dakdb/update85.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+add per-suite close_bugs option
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2012 Ansgar Burchardt <ansgar@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from daklib.config import Config
+
+def do_update(self):
+    print __doc__
+    try:
+        cnf = Config()
+
+        c = self.db.cursor()
+
+        c.execute("ALTER TABLE suite ADD COLUMN close_bugs BOOLEAN")
+
+        c.execute("UPDATE config SET value = '85' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError as msg:
+        self.db.rollback()
+        raise DBUpdateError('Unable to apply sick update 85, rollback issued. Error message: {0}'.format(msg))
diff --git a/dak/update_db.py b/dak/update_db.py
index 2f3a17e..3a33c97 100755
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -46,7 +46,7 @@ from daklib.daklog import Logger
 ################################################################################
 
 Cnf = None
-required_database_schema = 84
+required_database_schema = 85
 
 ################################################################################
 
diff --git a/daklib/announce.py b/daklib/announce.py
index aa68732..6c0fd37 100644
--- a/daklib/announce.py
+++ b/daklib/announce.py
@@ -143,7 +143,9 @@ def announce_accept(upload):
             message = TemplateSubst(my_subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
             send_mail(message)
 
-    if accepted_to_real_suite and upload.sourceful and cnf.find_b('Dinstall::CloseBugs'):
+    close_bugs_default = cnf.find_b('Dinstall::CloseBugs')
+    close_bugs = any(s.close_bugs if s.close_bugs is not None else close_bugs_default for s in upload.suites)
+    if accepted_to_real_suite and upload.sourceful and close_bugs:
         for bug in upload.bugs:
             my_subst = subst.copy()
             my_subst['__BUG_NUMBER__'] = str(bug)
-- 
1.7.2.5