sync

[dak.git] / charisma

diff --git a/charisma b/charisma
index a982e44345e4eeb7e2caa9fdd9fe0e8f74b2592a..6a23ab9cd7c181c5217341ad4118e32c450e025b 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.5 2001-03-15 01:59:18 troup Exp $
+# $Id: charisma,v 1.9 2001-09-13 23:51:51 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
@@ -27,14 +27,13 @@
 ####################################################################################################################################
 
 import os, pg, re, string, sys
+import db_access, utils
 import apt_pkg
-import utils
 
 ####################################################################################################################################
 
 projectB = None
 Cnf = None
-maintainer_cache = {}
 maintainer_from_source_cache = {}
 packages = {}
 fixed_maintainer_cache = {}
@@ -51,25 +50,18 @@ def fix_maintainer (maintainer):
 
     return fixed_maintainer_cache[maintainer]
 
+def get_maintainer (maintainer):
+    return fix_maintainer(db_access.get_maintainer(maintainer));
+
 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 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)
-        
-    return maintainer_from_source_cache[source_id]
 
-def get_maintainer (maintainer_id):
-    global maintainer_cache
-    
-    if not maintainer_cache.has_key(maintainer_id):
-        q = projectB.query("SELECT name FROM maintainer WHERE id = %s" % (maintainer_id));
-        maintainer = q.getresult()[0][0]
-        maintainer_cache[maintainer_id] = fix_maintainer(maintainer)
-        
-    return maintainer_cache[maintainer_id]
+    return maintainer_from_source_cache[source_id]
 
 ####################################################################################################################################
 
@@ -77,13 +69,14 @@ def main():
     global Cnf, projectB;
 
     apt_pkg.init();
-    
+
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
     extra_files = apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
 
-    projectB = pg.connect('projectb', Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, Cnf["DB::ROUser"]);
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
+    db_access.init(Cnf, projectB);
 
     for suite in Cnf.SubTree("Suite").List():
         suite = string.lower(suite);
@@ -111,7 +104,7 @@ def main():
             source_id = binary[1];
             version = binary[3];
             # Use the source maintainer first; falling back on the binary maintainer as a last resort only
-            if source_id != 0:
+            if source_id != 0 and source_id != None:
                 maintainer = get_maintainer_from_source(source_id);
             else:
                 maintainer = get_maintainer(binary[2]);
@@ -132,7 +125,7 @@ def main():
             if not packages.has_key(package):
                 packages[package] = { "maintainer": maintainer, "priority": 0 }
         file.close()
-    
+
     package_keys = packages.keys()
     package_keys.sort()
     for package in package_keys: