From 3675b979c31f71967abd5d947c4122f62cc8941a Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sat, 25 Sep 2010 14:02:37 +0000 Subject: [PATCH] Define Britney changelog file from suite table Signed-off-by: Luca Falavigna --- config/debian/dak.conf | 5 ----- dak/control_suite.py | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 403d1d59..03444045 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -470,8 +470,3 @@ Common // The default number of threads for multithreading parts of dak: ThreadCount 16; } - -Changelogs -{ - Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog"; -} diff --git a/dak/control_suite.py b/dak/control_suite.py index 9eb8ae22..e91373ad 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -99,6 +99,13 @@ def britney_changelog(packages, suite, session): old = {} current = {} + try: + q = session.execute("""SELECT britney_changelog FROM suite + WHERE id = :suiteid""", {'suiteid': suite.suite_id}) + brit_file = q.fetchone()[0] + except: + return + q = session.execute("""SELECT s.source, s.version, sa.id FROM source s, src_associations sa WHERE sa.suite = :suiteid @@ -129,7 +136,7 @@ def britney_changelog(packages, suite, session): q = session.execute(query) pu = None - brit = utils.open_file(Config()["Changelogs::Britney"], 'w') + brit = utils.open_file(brit_file, 'w') for u in q: if pu and pu != u[0]: -- 2.39.5