Fix database name to be a config option. Fix debian/rules typo. [Ryan Murray]

[dak.git] / charisma

diff --git a/charisma b/charisma
index dd1eb397cc7e9bc3a0ec23b7578190f967a3f74d..aeebd81dda4ea8ccf1ca54acf8498362e3521d76 100755 (executable)
--- a/charisma
+++ b/charisma
@@ -2,7 +2,7 @@
 
 # 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.4 2001-03-02 02:24:33 troup Exp $
+# $Id: charisma,v 1.6 2001-03-20 00:28:11 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
@@ -55,7 +55,7 @@ def get_maintainer_from_source (source_id):
     global maintainer_from_source_cache
     
     if not maintainer_from_source_cache.has_key(source_id):
-        q = projectB.query("SELECT name FROM maintainer WHERE id IN (SELECT maintainer FROM source WHERE id = %s)" % (source_id));
+        q = projectB.query("SELECT m.name FROM maintainer m, source s WHERE s.id = %s and s.maintainer = m.id" % (source_id));
         maintainer = q.getresult()[0][0]
         maintainer_from_source_cache[source_id] = fix_maintainer(maintainer)
         
@@ -76,8 +76,6 @@ def get_maintainer (maintainer_id):
 def main():
     global Cnf, projectB;
 
-    projectB = pg.connect('projectb', 'localhost');
-
     apt_pkg.init();
     
     Cnf = apt_pkg.newConfiguration();
@@ -85,6 +83,8 @@ def main():
 
     extra_files = apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
 
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, Cnf["DB::ROUser"]);
+
     for suite in Cnf.SubTree("Suite").List():
         suite = string.lower(suite);
         suite_priority = int(Cnf["Suite::%s::Priority" % (suite)]);