X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=natalie.py;h=b37378ce8fba5b808ae97a09d47000c470dd1af1;hb=1c6bcb3e467be8d9aa2641ff60d891dc900c35f7;hp=4f127a1e8aaa00207a3887bc4429587d881586a9;hpb=6107f16d4e55f6b640f4dc377753aee684d1ac14;p=dak.git

diff --git a/natalie.py b/natalie.py
index 4f127a1e..b37378ce 100755
--- a/natalie.py
+++ b/natalie.py
@@ -2,7 +2,7 @@
 
 # Manipulate override files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: natalie.py,v 1.8 2001-08-21 15:40:10 troup Exp $
+# $Id: natalie.py,v 1.10 2001-09-17 11:18:37 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -94,7 +94,7 @@ def process_file (file, suite, component, type):
         if line == "":
             continue;
 
-        maintainer_override = "";
+        maintainer_override = None;
         if type == "dsc":
             split_line = string.split(line, None, 2);
             if len(split_line) == 2:
@@ -196,11 +196,11 @@ def list(suite, component, type):
     if type == "dsc":
         q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, type_id));
         for i in q.getresult():
-            print string.join(i, '\t');
+            print utils.result_join(i);
     else:
         q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, type_id));
         for i in q.getresult():
-            print string.join(i[:-1], '\t');
+            print utils.result_join(i[:-1]);
 
 ################################################################################