X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=ee55fcc59e5f8dbf16daf51917306161138ef0bf;hb=310e68d162db3006294b9df3d4d715bb9ceac822;hp=be31e001c5db1bf4f59831d6c8558d0bcd8a5f03;hpb=3532610b2e863b9dd0c571fb2dc9538cd3d29f6e;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py index be31e001..ee55fcc5 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -43,6 +43,7 @@ import sys import apt_pkg +import os from daklib.config import Config from daklib.dbconn import * @@ -98,12 +99,18 @@ def britney_changelog(packages, suite, session): old = {} current = {} + Cnf = utils.get_conf() try: q = session.execute("SELECT changelog FROM suite WHERE id = :suiteid", \ {'suiteid': suite.suite_id}) brit_file = q.fetchone()[0] except: + brit_file = None + + if brit_file: + brit_file = os.path.join(Cnf['Dir::Root'], brit_file) + else: return q = session.execute("""SELECT s.source, s.version, sa.id