Move result_join() to utils; add an optional seperator argument; use it in natalie

[dak.git] / denise

diff --git a/denise b/denise
index a6772c39aee618275f1b1599343b7dd52b72a75a..7d7ed1025c124407b35b1ece99163bd5b8458ebe 100755 (executable)
--- a/denise
+++ b/denise
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: denise,v 1.7 2001-09-13 23:51:51 troup Exp $
+# $Id: denise,v 1.8 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
@@ -36,15 +36,6 @@ override = {}
 
 ################################################################################
 
-def result_join (original):
-    list = [];
-    for i in xrange(len(original)):
-        if original[i] == None:
-            list.append("");
-        else:
-            list.append(original[i]);
-    return string.join(list, '\t');
-
 def list(suite, component, type):
     global override;
 
@@ -71,13 +62,13 @@ def list(suite, component, type):
         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():
             override[suite][component][type][i[0]] = i;
-            print result_join(i);
+            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():
             i = i[:-1]; # Strip the priority level
             override[suite][component][type][i[0]] = i;
-            print result_join(i);
+            print utils.result_join(i);
 
 ################################################################################
 
@@ -145,9 +136,9 @@ def main ():
             for i in q.getresult():
                 package = i[0];
                 if override["unstable"][component][type].has_key(package):
-                    print result_join(override["unstable"][component][type][package]);
+                    print utils.result_join(override["unstable"][component][type][package]);
                 elif override["stable"][component][type].has_key(package):
-                    print result_join(override["stable"][component][type][package]);
+                    print utils.result_join(override["stable"][component][type][package]);
                 else:
                     if type == "dsc" and (override["unstable"][component]["deb"].has_key(package) or override["stable"][component]["deb"].has_key(package)):
                         continue; # source falls back on binary; so accept silently