s/britney_changelog/changelog/

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

diff --git a/dak/control_suite.py b/dak/control_suite.py
index e91373ad4a8e4c53f41c7efd70b8cbbbd0458ebf..be31e001c5db1bf4f59831d6c8558d0bcd8a5f03 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -100,8 +100,8 @@ def britney_changelog(packages, suite, session):
     current = {}
 
     try:
-        q = session.execute("""SELECT britney_changelog FROM suite
-                               WHERE id = :suiteid""", {'suiteid': suite.suite_id})
+        q = session.execute("SELECT changelog FROM suite WHERE id = :suiteid", \
+                            {'suiteid': suite.suite_id})
         brit_file = q.fetchone()[0]
     except:
         return

diff --git a/dak/dakdb/update39.py b/dak/dakdb/update39.py
index 921895532dde854c01a12c5a08c8c8e18a1bb459..558dc44fe119a3365c6c636f94c99e89215f9546 100644 (file)
--- a/dak/dakdb/update39.py
+++ b/dak/dakdb/update39.py
@@ -37,8 +37,8 @@ def do_update(self):
     try:
         c = self.db.cursor()
         c.execute("INSERT INTO config(name, value) VALUES ('exportpath', '/srv/ftp-master.debian.org/export/changelogs')")
-        c.execute("ALTER TABLE suite ADD COLUMN britney_changelog text NULL")
-        c.execute("UPDATE suite SET britney_changelog = '/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog' WHERE suite_name = 'testing'")
+        c.execute("ALTER TABLE suite ADD COLUMN changelog text NULL")
+        c.execute("UPDATE suite SET changelog = '/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog' WHERE suite_name = 'testing'")
         c.execute("UPDATE config SET value = '39' WHERE name = 'db_revision'")
         self.db.commit()