From: Luca Falavigna Date: Sun, 3 Oct 2010 12:46:33 +0000 (+0000) Subject: s/britney_changelog/changelog/ X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3532610b2e863b9dd0c571fb2dc9538cd3d29f6e;p=dak.git s/britney_changelog/changelog/ Signed-off-by: Luca Falavigna --- diff --git a/dak/control_suite.py b/dak/control_suite.py index e91373ad..be31e001 100755 --- 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 92189553..558dc44f 100644 --- 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()