X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=charisma;h=cc352dc1a838fb6a597258df014c13dc1e3b63c1;hb=5b7e16de8a94b2600336cc8954fbb995e5a0b3bf;hp=63d9a918e29db617edaa54e6840ac69f08c82fe4;hpb=a092f0aa8e82394e25a16da9e87263ee26b8de0e;p=dak.git

diff --git a/charisma b/charisma
index 63d9a918..cc352dc1 100755
--- a/charisma
+++ b/charisma
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Generate Maintainers file used by e.g. the Debian Bug Tracking System
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: charisma,v 1.11 2001-09-27 01:23:41 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: charisma,v 1.14 2002-05-03 16:06:45 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,9 +26,9 @@
 
 ################################################################################
 
-import os, pg, re, string, sys
-import db_access, utils
-import apt_pkg
+import pg, string, sys;
+import db_access, utils;
+import apt_pkg;
 
 ################################################################################
 
@@ -76,13 +76,12 @@ def get_maintainer_from_source (source_id):
 def main():
     global Cnf, projectB;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     Arguments = [('h',"help","Charisma::Options::Help")];
-    Cnf["Charisma::Options::Help"] = "";
+    if not Cnf.has_key("Charisma::Options::Help"):
+	Cnf["Charisma::Options::Help"] = "";
+
     extra_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Charisma::Options");