From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 11 Jan 2011 22:39:48 +0000 (+0100)
Subject: Merge remote branch 'drkranz/overrides' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=be11dfd4b92f3ae0aabdb952afccb8f7a6824f9f;hp=5c983f83b1962e6885d01d7792dbe6f61fb7630d;p=dak.git

Merge remote branch 'drkranz/overrides' into merge

* drkranz/overrides:
  Avoid converting unicode strings into yaml nodes
  override.py: fix typo, spotted by Holger Levsen

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/override.py b/dak/override.py
index 75edbb58..13a277db 100755
--- a/dak/override.py
+++ b/dak/override.py
@@ -49,7 +49,7 @@ def usage (exit_code=0):
 Make microchanges or microqueries of the binary overrides
 
   -h, --help                 show this help and exit
-  -c, --check                chech override compliance
+  -c, --check                check override compliance
   -d, --done=BUG#            send priority/section change as closure to bug#
   -n, --no-action            don't do anything
   -s, --suite                specify the suite to use
diff --git a/dak/override_disparity.py b/dak/override_disparity.py
index fd3bc503..b0218517 100755
--- a/dak/override_disparity.py
+++ b/dak/override_disparity.py
@@ -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()