Postgres 7.1 fixes

[dak.git] / katie

diff --git a/katie b/katie
index cf26804343ea59c541b53fb202d2016e36a89a6b..230bfff30ac52e591b7a84e3e7fad807585ef757 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: katie,v 1.56 2001-07-28 18:07:58 troup Exp $
+# $Id: katie,v 1.58 2001-09-05 18:51:21 rmurray 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
@@ -128,7 +128,7 @@ class nmu_p:
                 return 0;
 
         # Some group maintained packages (e.g. Debian QA) are never NMU's
-        if self.group_maint.has_key(changes["maintainername"]):
+        if self.group_maint.has_key(changes["maintaineremail"]):
             return 0;
 
         return 1;
@@ -1353,15 +1353,12 @@ def main():
         print "katie version 0.0000000000";
         usage(0);
 
-    postgresql_user = None; # Default == Connect as user running program.
-
     # -n/--dry-run invalidates some other options which would involve things happening
     if Options["No-Action"]:
         Options["Automatic"] = "";
         Options["Ack-New"] = "";
-        postgresql_user = Cnf["DB::ROUser"];
 
-    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, postgresql_user);
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
 
     db_access.init(Cnf, projectB);
 
@@ -1388,7 +1385,7 @@ def main():
     Subst = {}
     Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
     Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"];
-    bcc = "X-Katie: $Revision: 1.56 $"
+    bcc = "X-Katie: $Revision: 1.58 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: