Use correct db_name for MD5 hash

[dak.git] / dak / override_disparity.py

diff --git a/dak/override_disparity.py b/dak/override_disparity.py
index 3ec6ff1f96d20832cf6a549e5fa3abb3efbb39f5..413dcaabfbfcca0cddc1ac2074711744b24b3371 100755 (executable)
--- a/dak/override_disparity.py
+++ b/dak/override_disparity.py
@@ -73,28 +73,31 @@ 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']
+    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)
-            while Packages.Step():
-                package = Packages.Section.Find('Package')
-                dep_list = Packages.Section.Find('Depends')
+            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')
                 if Options['package'] and package != Options['package']:
                     continue
                 if dep_list:
-                    for d in apt_pkg.ParseDepends(dep_list):
+                    for d in apt_pkg.parse_depends(dep_list):
                         for i in d:
                             if not depends.has_key(package):
                                 depends[package] = set()
@@ -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 = {}