diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 403d1d59c5c80dc802b0eba3e66d8808d4d7dda9..03444045ea3749a1042a3f8921fcf0cfe6220e39 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 9eb8ae22ce379f6465d04a940ff2449a112606e1..e91373ad4a8e4c53f41c7efd70b8cbbbd0458ebf 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]: