Merge remote branch 'drkranz/make-changelog' into merge

* drkranz/make-changelog:
  control_suite.py: fix britney changelog
  Add distribution to changelogs view

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

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 03cb73d57909fde42f03480658b17586559e0005..aac6d717691dc9ea4c3940b5bfe1724cde158841 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -123,7 +123,8 @@ def britney_changelog(packages, suite, session):
     for p in new.keys():
         query += " source = '%s' AND version > '%s' AND version <= '%s'" \
                  % (p, new[p][1], new[p][0])
-        query += " AND architecture LIKE '%source%' OR"
+        query += " AND architecture LIKE '%source%' AND distribution in \
+                  ('unstable', 'experimental', 'testing-proposed-updates') OR"
     query += " False ORDER BY source, version DESC"
     q = session.execute(query)
 

diff --git a/dak/dakdb/update35.py b/dak/dakdb/update35.py
new file mode 100644 (file)
index 0000000..335d70e
--- /dev/null
+++ b/dak/dakdb/update35.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add distribution to changelogs view
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2010 Luca Falavigna <dktrkranz@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
+
+################################################################################
+def do_update(self):
+    """
+    Add distribution to changelogs view
+    """
+    print __doc__
+    try:
+        c = self.db.cursor()
+        c.execute('CREATE OR REPLACE VIEW changelogs AS SELECT cl.id, source, CAST(version AS debversion), architecture, \
+                   changelog, distribution FROM changes c JOIN changelogs_text cl ON cl.id = c.changelog_id')
+        c.execute("GRANT SELECT ON changelogs TO public")
+        c.execute("UPDATE config SET value = '35' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError, msg:
+        self.db.rollback()
+        raise DBUpdateError, 'Unable to apply build_queue update 35, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/update_db.py b/dak/update_db.py
index 1fc0cc62c8ae3b8605fc4db8e3bf0cc62c335b30..c6dc404b3b492c0bba2c05fde5864c2d238ecfde 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -45,7 +45,7 @@ from daklib.dak_exceptions import DBUpdateError
 ################################################################################
 
 Cnf = None
-required_database_schema = 34
+required_database_schema = 35
 
 ################################################################################