X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=c525122e516c5a49acbb1658d1d0e2f7b8d87c9b;hb=4d67c5b3de7c0cc7b9efd35f667a54d9287662ef;hp=11c3fca2da79194729c695b258e179fda052cbe1;hpb=32f7dca0024ba451f67b754cc21b34fb0c24d1f5;p=dak.git

diff --git a/denise b/denise
index 11c3fca2..c525122e 100755
--- a/denise
+++ b/denise
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Output override files for apt-ftparchive and indices/
-# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: denise,v 1.12 2002-06-05 00:18:53 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2004  James Troup <james@nocrew.org>
+# $Id: denise,v 1.16 2004-01-21 03:19:52 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
@@ -26,8 +26,8 @@
 
 ################################################################################
 
-import pg, sys, string
-import utils, db_access
+import pg, sys;
+import utils, db_access;
 import apt_pkg;
 
 ################################################################################
@@ -38,6 +38,15 @@ override = {}
 
 ################################################################################
 
+def usage(exit_code=0):
+    print """Usage: denise
+Outputs the override tables to text files.
+
+  -h, --help                show this help and exit."""
+    sys.exit(exit_code)
+
+################################################################################
+
 def list(file, suite, component, type):
     global override;
 
@@ -78,10 +87,14 @@ def main ():
     global Cnf, projectB, override;
 
     Cnf = utils.get_conf()
-    Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"),
-                 ('h',"help","Denise::Options::Help"),
-                 ('V',"version","Denise::Options::Version")];
+    Arguments = [('h',"help","Denise::Options::Help")];
+    for i in [ "help" ]:
+	if not Cnf.has_key("Denise::Options::%s" % (i)):
+	    Cnf["Denise::Options::%s" % (i)] = "";
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
+    Options = Cnf.SubTree("Denise::Options")
+    if Options["Help"]:
+	usage();
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
@@ -101,7 +114,7 @@ def main ():
                     override_type = ".debian-installer";
                 elif type == "dsc":
                     override_type = ".src";
-                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, string.replace(component, "non-US/", ""), override_type);
+                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();
@@ -118,26 +131,36 @@ def main ():
             continue;
         component_id = db_access.get_component_id(component);
         for type in Cnf.ValueList("OverrideType"):
-            if type == "deb":
-                override_type = "";
-                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 ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id));
+            if type == "deb" or type == "udeb":
+                if type == "deb":
+                    override_type = "";
+                elif type == "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":
                 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";
-            elif type == "udeb":
-                continue;
-            filename = "override.%s.%s%s" % (override_suite, string.replace(component, "non-US/", ""), override_type);
+            filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type);
             file = utils.open_file(filename, 'w');
             for i in q.getresult():
                 package = i[0];
-                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');
-                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));
+                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');
+                    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));
+                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');
+                    else:
+                        utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type));
+
             file.close();
 
 #######################################################################################