X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=4b0f5847317818e8a3a808b075b4533a25cc26b8;hb=dd020c0a97372adb701bb8207e09d82cb3c5ae6b;hp=b3bc7a90c2c26d2431a9f89f41c829839afcd930;hpb=4f0163798cda7f6c83621ecba4f06c712bade6e3;p=dak.git

diff --git a/denise b/denise
index b3bc7a90..4b0f5847 100755
--- a/denise
+++ b/denise
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: denise,v 1.13 2002-07-30 19:02:06 troup Exp $
+# $Id: denise,v 1.15 2003-01-02 18:10:02 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();
@@ -126,7 +139,7 @@ def main ():
                 override_type = ".src";
             elif type == "udeb":
                 continue;
-            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');
             for i in q.getresult():
                 package = i[0];