X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_overrides.py;h=1087ce286784d57110c1e51faef6450fd3ef8188;hb=8e60420c69a993a4041c22008dafc2fcb238d0d5;hp=2517b67a021442c345a24e4dedfc44bf19c87861;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 2517b67a..1087ce28 100755
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
 # Output override files for apt-ftparchive and indices/
-# Copyright (C) 2000, 2001, 2002, 2004  James Troup <james@nocrew.org>
-# $Id: denise,v 1.18 2005-11-15 09:50:32 ajt Exp $
+# Copyright (C) 2000, 2001, 2002, 2004, 2006  James Troup <james@nocrew.org>
 
 # 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
@@ -21,14 +20,15 @@
 ################################################################################
 
 # This is seperate because it's horribly Debian specific and I don't
-# want that kind of horribleness in the otherwise generic natalie.  It
-# does duplicate code tho.
+# want that kind of horribleness in the otherwise generic 'dak
+# make-overrides'.  It does duplicate code tho.
 
 ################################################################################
 
 import pg, sys
-import utils, db_access
 import apt_pkg
+from daklib import database
+from daklib import utils
 
 ################################################################################
 
@@ -39,7 +39,7 @@ override = {}
 ################################################################################
 
 def usage(exit_code=0):
-    print """Usage: denise
+    print """Usage: dak make-overrides
 Outputs the override tables to text files.
 
   -h, --help                show this help and exit."""
@@ -50,15 +50,15 @@ Outputs the override tables to text files.
 def do_list(output_file, suite, component, otype):
     global override
 
-    suite_id = db_access.get_suite_id(suite)
+    suite_id = database.get_suite_id(suite)
     if suite_id == -1:
         utils.fubar("Suite '%s' not recognised." % (suite))
 
-    component_id = db_access.get_component_id(component)
+    component_id = database.get_component_id(component)
     if component_id == -1:
         utils.fubar("Component '%s' not recognised." % (component))
 
-    otype_id = db_access.get_override_type_id(otype)
+    otype_id = database.get_override_type_id(otype)
     if otype_id == -1:
         utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (otype))
 
@@ -84,19 +84,19 @@ def main ():
     global Cnf, projectB, override
 
     Cnf = utils.get_conf()
-    Arguments = [('h',"help","Denise::Options::Help")]
+    Arguments = [('h',"help","Make-Overrides::Options::Help")]
     for i in [ "help" ]:
-	if not Cnf.has_key("Denise::Options::%s" % (i)):
-	    Cnf["Denise::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Make-Overrides::Options::%s" % (i)):
+            Cnf["Make-Overrides::Options::%s" % (i)] = ""
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
-    Options = Cnf.SubTree("Denise::Options")
+    Options = Cnf.SubTree("Make-Overrides::Options")
     if Options["Help"]:
-	usage()
+        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    db_access.init(Cnf, projectB)
+    database.init(Cnf, projectB)
 
-    for suite in Cnf.SubTree("Cindy::OverrideSuites").List():
+    for suite in Cnf.SubTree("Check-Overrides::OverrideSuites").List():
         if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0:
             continue
         suite = suite.lower()
@@ -110,12 +110,12 @@ def main ():
                 if otype == "deb":
                     suffix = ""
                 elif otype == "udeb":
-                    if component != "main":
+                    if component == "contrib":
                         continue; # Ick2
                     suffix = ".debian-installer"
                 elif otype == "dsc":
                     suffix = ".src"
-                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix)
+                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component, suffix)
                 output_file = utils.open_file(filename, 'w')
                 do_list(output_file, suite, component, otype)
                 output_file.close()