Add database fields to override compression methods.

[dak.git] / dak / override_disparity.py

diff --git a/dak/override_disparity.py b/dak/override_disparity.py
index fd3bc503e72124ccd055b607359bba12a8a77914..6cb392df7f3ff673c1f9d89d0e0a1001e8d341dd 100755 (executable)
--- a/dak/override_disparity.py
+++ b/dak/override_disparity.py
@@ -73,8 +73,8 @@ 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()
@@ -82,7 +82,7 @@ def main():
     depends = {}
     session = DBConn().session()
     suite = Options['suite']
-    components = cnf.ValueList('Suite::%s::Components' % suite)
+    components = get_component_names(session)
     arches = set([x.arch_string for x in get_suite_architectures(suite)])
     arches -= set(['source', 'all'])
     for arch in arches:
@@ -128,13 +128,13 @@ def main():
                          if not out.has_key(d):
                              out[d] = {}
                          out[d]['priority'] = priorities[d][1]
-                         out[d]['maintainer'] = priorities[d][2]
+                         out[d]['maintainer'] = unicode(priorities[d][2], 'utf-8')
                          out[d]['priority'] = priorities[d][1]
                          priorities[d][3] = False
                      if not out[d].has_key('dependency'):
                          out[d]['dependency'] = {}
                      out[d]['dependency'][p] = priorities[p][1]
-    yaml.dump(out, outfile, default_flow_style=False)
+    yaml.safe_dump(out, outfile, default_flow_style=False)
     if Options.has_key('file'):
         outfile.close()