From: Ryan Murray <rmurray@debian.org>
Date: Wed, 5 Sep 2001 18:51:21 +0000 (+0000)
Subject: Remove use of ROUser -- both auric and pandora have select granted to public(everyone... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=23a99af787214540a7965b5747bdc01ed4e1e2e6;p=dak.git

Remove use of ROUser -- both auric and pandora have select granted to public(everyone), and postgres 7.1's sameuser needs it.
---

diff --git a/charisma b/charisma
index 362ed5e5..bc45aa40 100755
--- 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.7 2001-04-03 10:01:27 troup Exp $
+# $Id: charisma,v 1.8 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
@@ -75,7 +75,7 @@ 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"]);
+    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():
diff --git a/katie b/katie
index 1649d22d..230bfff3 100755
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: katie,v 1.57 2001-08-26 00:36:12 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
@@ -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.57 $"
+    bcc = "X-Katie: $Revision: 1.58 $"
     if Cnf.has_key("Dinstall::Bcc"):
         Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else:
diff --git a/katie.conf b/katie.conf
index 0223f10b..04383af3 100644
--- a/katie.conf
+++ b/katie.conf
@@ -398,7 +398,6 @@ DB
   Name "projectb";
   Host ""; 
   Port -1;
-  ROUser "nobody";
 };
 
 Architectures
diff --git a/katie.conf-non-US b/katie.conf-non-US
index d05ea062..c60d64a5 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -380,7 +380,6 @@ DB
   Name "projectb";
   Host "";
   Port -1;
-  ROUser "nobody";
 };
 
 Architectures
diff --git a/madison b/madison
index cfbad280..4c176008 100755
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: madison,v 1.8 2001-08-21 15:44:27 troup Exp $
+# $Id: madison,v 1.9 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
@@ -65,7 +65,7 @@ def main ():
 
     packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Madison::Options")
-    projectB = pg.connect(Cnf["DB::Name"], 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);
 
     if packages == []: