X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride_disparity.py;h=6b0f9da497e517fde6103b9ec89658c2b6edf4f1;hb=6aa926a257c755fc75b394d9d0a7273faf994a2d;hp=b0218517048e564ac82d022b7b4de173ea405bbb;hpb=be11dfd4b92f3ae0aabdb952afccb8f7a6824f9f;p=dak.git

diff --git a/dak/override_disparity.py b/dak/override_disparity.py
index b0218517..6b0f9da4 100755
--- a/dak/override_disparity.py
+++ b/dak/override_disparity.py
@@ -73,21 +73,24 @@ def main():
     if not cnf.has_key('Override-Disparity::Options::Suite'):
         cnf['Override-Disparity::Options::Suite'] = 'unstable'
 
-    apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree('Override-Disparity::Options')
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree('Override-Disparity::Options')
 
     if Options['help']:
         usage()
 
     depends = {}
     session = DBConn().session()
-    suite = Options['suite']
-    components = cnf.ValueList('Suite::%s::Components' % suite)
-    arches = set([x.arch_string for x in get_suite_architectures(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_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 = {}