X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=e83dfa3d6f6ff5f1699c8062c3ed6b304766bb67;hb=425e44739cd77ffa01294f23e94ae7eabd5f5ec8;hp=2b06146b3b1e00aeff6bfaacebe56cbd0932605d;hpb=81d0c91b0d085b66aa40a9e147698f618b825d62;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 2b06146b..e83dfa3d 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -37,7 +37,9 @@ import tempfile import subprocess import time import apt_pkg +import pg from daklib import utils +from daklib import database ################################################################################ @@ -278,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) @@ -309,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() @@ -316,13 +321,15 @@ def main(): print "Processing: " + suite SuiteBlock = Cnf.SubTree("Suite::" + suite) - if SuiteBlock.has_key("Untouchable"): + if database.get_suite_untouchable(suite): print "Skipping: " + suite + " (untouchable)" continue suite = suite.lower() - architectures = SuiteBlock.ValueList("Architectures") + architectures = database.get_suite_architectures(suite) + if architectures == None: + architectures = [] if SuiteBlock.has_key("Components"): components = SuiteBlock.ValueList("Components")