X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride_disparity.py;h=3ec6ff1f96d20832cf6a549e5fa3abb3efbb39f5;hb=8eacd63f7c91d557537a5672e59a7ff854e159ff;hp=fd3bc503e72124ccd055b607359bba12a8a77914;hpb=cc8c39a7a9d895a5662c73f225318d74995bec92;p=dak.git

diff --git a/dak/override_disparity.py b/dak/override_disparity.py
index fd3bc503..3ec6ff1f 100755
--- a/dak/override_disparity.py
+++ b/dak/override_disparity.py
@@ -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()