2004-11-27 James Troup <james@nocrew.org> * denise (list): rename ... (do_list...

diff --git a/denise b/denise
index c525122e516c5a49acbb1658d1d0e2f7b8d87c9b..9677460987944bffa44960c8c20bba11828f2d5f 100755 (executable)
--- a/denise
+++ b/denise
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001, 2002, 2004  James Troup <james@nocrew.org>
-# $Id: denise,v 1.16 2004-01-21 03:19:52 troup Exp $
+# $Id: denise,v 1.17 2004-11-27 17:56:42 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
@@ -47,7 +47,7 @@ Outputs the override tables to text files.
 
 ################################################################################
 
-def list(file, suite, component, type):
+def do_list(output_file, suite, component, otype):
     global override;
 
     suite_id = db_access.get_suite_id(suite);
@@ -58,28 +58,25 @@ def list(file, suite, component, type):
     if component_id == -1:
         utils.fubar("Component '%s' not recognised." % (component));
 
-    type_id = db_access.get_override_type_id(type);
-    if type_id == -1:
-        utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type));
+    otype_id = db_access.get_override_type_id(otype);
+    if otype_id == -1:
+        utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (otype));
 
-    if not override.has_key(suite):
-        override[suite] = {};
-    if not override[suite].has_key(component):
-        override[suite][component] = {};
-    if not override[suite][component].has_key(type):
-        override[suite][component][type] = {};
+    override.setdefault(suite, {});
+    override[suite].setdefault(component, {});
+    override[suite][component].setdefault(otype, {});
 
-    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));
+    if otype == "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, otype_id));
         for i in q.getresult():
-            override[suite][component][type][i[0]] = i;
-            file.write(utils.result_join(i)+'\n');
+            override[suite][component][otype][i[0]] = i;
+            output_file.write(utils.result_join(i)+'\n');
     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));
+        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, otype_id));
         for i in q.getresult():
             i = i[:-1]; # Strip the priority level
-            override[suite][component][type][i[0]] = i;
-            file.write(utils.result_join(i)+'\n');
+            override[suite][component][otype][i[0]] = i;
+            output_file.write(utils.result_join(i)+'\n');
 
 ################################################################################
 
@@ -105,19 +102,19 @@ def main ():
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":
                 continue; # Ick
-            for type in Cnf.ValueList("OverrideType"):
-                if type == "deb":
-                    override_type = "";
-                elif type == "udeb":
+            for otype in Cnf.ValueList("OverrideType"):
+                if otype == "deb":
+                    suffix = "";
+                elif otype == "udeb":
                     if suite != "unstable" or component != "main":
                         continue; # Ick2
-                    override_type = ".debian-installer";
-                elif type == "dsc":
-                    override_type = ".src";
-                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type);
-                file = utils.open_file(filename, 'w');
-                list(file, suite, component, type);
-                file.close();
+                    suffix = ".debian-installer";
+                elif otype == "dsc":
+                    suffix = ".src";
+                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix);
+                output_file = utils.open_file(filename, 'w');
+                do_list(output_file, suite, component, otype);
+                output_file.close();
 
     # Munge the override file for testing by using unstable's where
     # possible and falling back on stable's where it's not.
@@ -130,41 +127,40 @@ def main ():
         if component == "mixed":
             continue;
         component_id = db_access.get_component_id(component);
-        for type in Cnf.ValueList("OverrideType"):
-            if type == "deb" or type == "udeb":
-                if type == "deb":
-                    override_type = "";
-                elif type == "udeb":
+        for otype in Cnf.ValueList("OverrideType"):
+            if otype == "deb" or otype == "udeb":
+                if otype == "deb":
+                    suffix = "";
+                elif otype == "udeb":
                     if component != "main":
                         continue;
-                    override_type = ".debian-installer";
-                q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND b.type = '%s' AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id, type));
-            elif type == "dsc":
+                    suffix = ".debian-installer";
+                q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND b.type = '%s' AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id, otype));
+            elif otype == "dsc":
                 q = projectB.query("SELECT DISTINCT s.source FROM src_associations sa, source s, files f, location l WHERE sa.suite = %s AND l.component = %s AND sa.source = s.id AND s.file = f.id AND f.location = l.id" % (suite_id, component_id));
-                override_type = ".src";
-            filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type);
-            file = utils.open_file(filename, 'w');
+                suffix = ".src";
+            filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix);
+            output_file = utils.open_file(filename, 'w');
             for i in q.getresult():
                 package = i[0];
-                if type == "deb" or type == "dsc":
-                    if override["unstable"][component][type].has_key(package):
-                        file.write(utils.result_join(override["unstable"][component][type][package])+'\n');
-                    elif override["stable"][component][type].has_key(package):
-                        file.write(utils.result_join(override["stable"][component][type][package])+'\n');
+                if otype == "deb" or otype == "dsc":
+                    if override["unstable"][component][otype].has_key(package):
+                        output_file.write(utils.result_join(override["unstable"][component][otype][package])+'\n');
+                    elif override["stable"][component][otype].has_key(package):
+                        output_file.write(utils.result_join(override["stable"][component][otype][package])+'\n');
                     else:
-                        if type == "dsc" and (override["unstable"][component]["deb"].has_key(package) or override["stable"][component]["deb"].has_key(package)):
+                        if otype == "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));
-                elif type == "udeb":
-                    if component == "main" and override["unstable"][component][type].has_key(package):
-                        file.write(utils.result_join(override["unstable"][component][type][package])+'\n');
+                        utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, otype));
+                elif otype == "udeb":
+                    if component == "main" and override["unstable"][component][otype].has_key(package):
+                        output_file.write(utils.result_join(override["unstable"][component][otype][package])+'\n');
                     else:
-                        utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type));
+                        utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, otype));
 
-            file.close();
+            output_file.close();
 
-#######################################################################################
+################################################################################
 
 if __name__ == '__main__':
-    main()
-
+    main();