X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride_disparity.py;h=6b0f9da497e517fde6103b9ec89658c2b6edf4f1;hb=077bf03c4495465e28388f52e471877b7afa821a;hp=6cb392df7f3ff673c1f9d89d0e0a1001e8d341dd;hpb=6b3c8ccbd61325e2b833ed252b5545a190bff92f;p=dak.git diff --git a/dak/override_disparity.py b/dak/override_disparity.py index 6cb392df..6b0f9da4 100755 --- a/dak/override_disparity.py +++ b/dak/override_disparity.py @@ -81,13 +81,16 @@ def main(): depends = {} session = DBConn().session() - suite = Options['suite'] + suite_name = Options['suite'] + suite = get_suite(suite_name, session) + if suite is None: + utils.fubar("Unknown suite '{0}'".format(suite_name)) components = get_component_names(session) - arches = set([x.arch_string for x in get_suite_architectures(suite)]) + arches = set([x.arch_string for x in get_suite_architectures(suite_name)]) arches -= set(['source', 'all']) for arch in arches: for component in components: - Packages = utils.get_packages_from_ftp(cnf['Dir::Root'], suite, component, arch) + Packages = utils.get_packages_from_ftp(suite.archive.path, suite_name, component, arch) while Packages.Step(): package = Packages.Section.Find('Package') dep_list = Packages.Section.Find('Depends') @@ -110,7 +113,7 @@ def main(): JOIN bin_associations ba ON ba.bin = b.id WHERE s.suite_name = '%s' AND ba.suite = s.id - AND p.level <> 0""" % suite + AND p.level <> 0""" % suite_name packages = session.execute(query) out = {}