From: Mark Hymers Date: Sat, 28 Feb 2009 21:38:55 +0000 (+0000) Subject: Merge commit 'ftpmaster/master' X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1c11b7bd8cf8a93d4e0cbca31e02bdc6257fc4fc;hp=ec73fa2dc5acdc3062336d90685a17dfc4b21213;p=dak.git Merge commit 'ftpmaster/master' --- diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 097707d8..774e0467 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -37,6 +37,7 @@ import tempfile import subprocess import time import apt_pkg +import pg from daklib import utils from daklib import database @@ -279,7 +280,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): def main(): - global Cnf, Options, Logger + global Cnf, Options, Logger, projectB os.umask(0002) @@ -310,6 +311,9 @@ def main(): if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"] + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) + database.init(Cnf, projectB) + if not suites: suites = Cnf.SubTree("Suite").List()