X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=ee55fcc59e5f8dbf16daf51917306161138ef0bf;hb=db4d3b713caf2fdc24b44d08214a6a9b1b006f17;hp=fcd4ca39562cf0c96e61f2364dc3e412a1b01ed0;hpb=69f09ae38116af1a2f74db7eb6d9c84c23ed7384;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py index fcd4ca39..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,6 +99,7 @@ def britney_changelog(packages, suite, session): old = {} current = {} + Cnf = utils.get_conf() try: q = session.execute("SELECT changelog FROM suite WHERE id = :suiteid", \ @@ -106,7 +108,9 @@ def britney_changelog(packages, suite, session): except: brit_file = None - if not brit_file: + 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