X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=denise;h=7d7ed1025c124407b35b1ece99163bd5b8458ebe;hb=b618ca40333f46edada83f0329f85cec83bca7eb;hp=2e2c16e40cbd374ad20e99bc614cb411263b56fa;hpb=6ada259d555e36a1546789c280edc3f944b7de7f;p=dak.git

diff --git a/denise b/denise
index 2e2c16e4..7d7ed102 100755
--- 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.5 2001-06-22 22:53:14 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
@@ -38,7 +38,7 @@ override = {}
 
 def list(suite, component, type):
     global override;
-    
+
     suite_id = db_access.get_suite_id(suite);
     if suite_id == -1:
         utils.fubar("Suite '%s' not recognised." % (suite));
@@ -62,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 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():
             i = i[:-1]; # Strip the priority level
             override[suite][component][type][i[0]] = i;
-            print string.join(i, '\t');
+            print utils.result_join(i);
 
 ################################################################################
 
@@ -76,7 +76,7 @@ def main ():
     global Cnf, projectB, override;
 
     apt_pkg.init();
-    
+
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
     Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"),
@@ -90,7 +90,7 @@ def main ():
     natalie.init();
 
     for suite in [ "stable", "unstable" ]:
-        print "Processing %s..." % (suite);
+        sys.stderr.write("Processing %s...\n" % (suite));
         override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)];
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":
@@ -113,7 +113,7 @@ def main ():
     # Munge the override file for testing by using unstable's where
     # possible and falling back on stable's where it's not.
 
-    print "Processing testing...";
+    sys.stderr.write("Processing testing...\n");
     suite = "testing";
     suite_id = db_access.get_suite_id(suite);
     override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)];
@@ -136,15 +136,14 @@ def main ():
             for i in q.getresult():
                 package = i[0];
                 if override["unstable"][component][type].has_key(package):
-                    print string.join(override["unstable"][component][type][package], '\t');
+                    print utils.result_join(override["unstable"][component][type][package]);
                 elif override["stable"][component][type].has_key(package):
-                    print string.join(override["stable"][component][type][package], '\t');
+                    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
                     utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type));
             sys.stdout.close();
-    
 
 #######################################################################################