From: Mark Hymers Date: Mon, 25 May 2009 17:45:14 +0000 (+0100) Subject: move gid to sqla X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd09c6c4c46e2e449f9cef5c1c8c58a971a6523;p=dak move gid to sqla Signed-off-by: Mark Hymers --- diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index e83dfa3d..4c941972 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -39,11 +39,10 @@ import time import apt_pkg import pg from daklib import utils -from daklib import database +from daklib.dbconn import get_suite ################################################################################ -projectB = None Cnf = None Logger = None Options = None @@ -280,7 +279,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): def main(): - global Cnf, Options, Logger, projectB + global Cnf, Options, Logger os.umask(0002) @@ -311,25 +310,23 @@ 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() - for suite in suites: + for suitename in suites: print "Processing: " + suite - SuiteBlock = Cnf.SubTree("Suite::" + suite) + SuiteBlock = Cnf.SubTree("Suite::" + suitename) + + suiteobj = get_suite(suitename.lower()) - if database.get_suite_untouchable(suite): + # Use the canonical version of the suite name + suite = suite.suite_name + + if suiteobj.untouchable: print "Skipping: " + suite + " (untouchable)" continue - suite = suite.lower() - - architectures = database.get_suite_architectures(suite) - if architectures == None: - architectures = [] + architectures = get_suite_architectures(suite, skipall=True) if SuiteBlock.has_key("Components"): components = SuiteBlock.ValueList("Components") @@ -353,9 +350,8 @@ def main(): print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue - for architecture in architectures: - if architecture == "all": - continue + for archobj in architectures: + architecture = archobj.arch_string if architecture != "source": # Process Contents