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

diff --git a/TODO b/TODO
index 4c35c4055331cf1620b64773c6c9c2eb9b6af9ce..c0642569ec72c979174a09f178baae3d739fbea1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,6 +28,8 @@ Urgent
 
   o Revisit linking of binary->source in install() in katie.
 
+  o debian/* assumes arch: all but sql-aptvc.o isn't arch: all.
+
 Less Urgent
 -----------
 

diff --git a/alyson b/alyson
index 2b55faa21b2498d542a762301df9916bbc0e004c..9801d596c6ce84c80fcbfe80408c0d9bed005ed9 100755 (executable)
--- a/alyson
+++ b/alyson
@@ -2,7 +2,7 @@
 
 # Sync the ISC configuartion file and the SQL database
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: alyson,v 1.3 2001-03-02 02:24:33 troup Exp $
+# $Id: alyson,v 1.4 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
@@ -43,7 +43,7 @@ def main ():
                  ('v',"version","Alyson::Options::Version")];
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     # Quick hack to populate section, priority and bin_type; the rest todo later

diff --git a/andrea b/andrea
index baa168605a4738c33e5d24cf2f9e8b8a7d4f4053..351c93747639f0bd65fce2f6cf3f67e7e55ca7ed 100755 (executable)
--- a/andrea
+++ b/andrea
@@ -2,7 +2,7 @@
 
 # Check for fixable discrepancies between stable and unstable
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: andrea,v 1.2 2001-03-02 02:47:29 troup Exp $
+# $Id: andrea,v 1.3 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
@@ -46,7 +46,7 @@ def main ():
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     src_suite = "stable";

diff --git a/catherine b/catherine
index 35885886a1d78f38c90d0d22040666c64fb7bcf1..a8815114c6adeb93b383865cb11c56aa9ac8ed3a 100755 (executable)
--- a/catherine
+++ b/catherine
@@ -2,7 +2,7 @@
 
 # Poolify (move packages from "legacy" type locations to pool locations)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: catherine,v 1.6 2001-03-02 02:24:33 troup Exp $
+# $Id: catherine,v 1.7 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
@@ -52,7 +52,7 @@ def main ():
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     poolized_size = 0;

diff --git a/charisma b/charisma
index a982e44345e4eeb7e2caa9fdd9fe0e8f74b2592a..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.5 2001-03-15 01:59:18 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
@@ -83,7 +83,7 @@ def main():
 
     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"]), None, None, Cnf["DB::ROUser"]);
 
     for suite in Cnf.SubTree("Suite").List():
         suite = string.lower(suite);

diff --git a/cindy b/cindy
index fc80afd50d4eadb6435ef7cd3c47b48025509a82..a963ea4c174bcf23e5470390bec64df34e24d038 100755 (executable)
--- a/cindy
+++ b/cindy
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: cindy,v 1.2 2001-03-02 02:46:02 troup Exp $
+# $Id: cindy,v 1.3 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
@@ -106,7 +106,7 @@ def main ():
                  ('V',"version","Denise::Options::Version")];
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     for suite in [ "stable", "unstable" ]:

diff --git a/claire.py b/claire.py
index c28e1d0a3b737b7398e99de0421e66d0f6aab39c..ac146f0b1297b965f76632d7654b4a9f3bcd07b3 100755 (executable)
--- a/claire.py
+++ b/claire.py
@@ -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: claire.py,v 1.5 2001-03-02 02:24:33 troup Exp $
+# $Id: claire.py,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
@@ -156,7 +156,7 @@ def main ():
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
 
     db_access.init(Cnf, projectB);
 

diff --git a/debian/rules b/debian/rules
index 94bece0d9fd51bcd255391ccf727cf16e4e2377c..eaf640c9f6d240e16c5a7e927fdbc91931f3d35d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ binary-indep: checkroot build
        install -m 755 rhona debian/tmp/usr/bin/da_clean
        install -m 755 madison debian/tmp/usr/bin/da_chkver
        install -m 755 natalie.py debian/tmp/usr/bin/da_override
-       install -m 755 melanie debian/tmp/usr/da_remove
+       install -m 755 melanie debian/tmp/usr/bin/da_remove
 
        install -d -m 755 debian/tmp/usr/lib/python1.5/site-packages/
        install -m 644 db_access.py utils.py debian/tmp/usr/lib/python1.5/site-packages/

diff --git a/denise b/denise
index a6ebe8431ad4d04cfdd2d5612adb2c16a70a19b7..2660e8bb8c39de613e0a4a04ebdb5066abc86819 100755 (executable)
--- a/denise
+++ b/denise
@@ -2,7 +2,7 @@
 
 # Output override files for apt-ftparchive and indices/
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: denise,v 1.3 2001-03-02 02:29:00 troup Exp $
+# $Id: denise,v 1.4 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
@@ -87,7 +87,7 @@ def main ():
                  ('V',"version","Denise::Options::Version")];
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     natalie.init();

diff --git a/heidi b/heidi
index 74a8cb7d4d6d9e611e21b44092a77aa4d2a3dfa7..c2f5071bb6b2dae1317c1f563239d1a13916c4ef 100755 (executable)
--- a/heidi
+++ b/heidi
@@ -2,7 +2,7 @@
 
 # Manipulate suite tags
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: heidi,v 1.4 2001-03-02 02:24:33 troup Exp $
+# $Id: heidi,v 1.5 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
@@ -160,7 +160,7 @@ def main ():
 
     file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"]));
 
     db_access.init(Cnf, projectB);
 

diff --git a/jenna b/jenna
index 52b80059fe767ccd5873c217a636ee54f136356d..121dee34d91a3e0af344424a656d3c30d87fbff3 100755 (executable)
--- a/jenna
+++ b/jenna
@@ -2,7 +2,7 @@
 
 # Generate file list which is then fed to apt-ftparchive to generate Packages and Sources files
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: jenna,v 1.6 2001-03-02 02:24:33 troup Exp $
+# $Id: jenna,v 1.7 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
@@ -140,8 +140,6 @@ def main():
     global Cnf, projectB;
     dislocated_files = {};
     
-    projectB = pg.connect('projectb', 'localhost');
-    
     apt_pkg.init();
     
     Cnf = apt_pkg.newConfiguration();
@@ -157,6 +155,7 @@ def main():
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     if Cnf["Jenna::Options::Suite"] == "":

diff --git a/katie b/katie
index 3162b31eb54668672e1ce9606fbae7c3dbc0f476..f9a2242cdcad5eb815c0dcdd0fbaab123fe5f2a1 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.31 2001-03-14 05:12:53 troup Exp $
+# $Id: katie,v 1.32 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
@@ -1275,7 +1275,7 @@ def main():
         Cnf["Dinstall::Options::Ack-New"] = ""
         postgresql_user = Cnf["DB::ROUser"];
 
-    projectB = pg.connect('projectb', Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, postgresql_user);
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, postgresql_user);
 
     db_access.init(Cnf, projectB);
 

diff --git a/katie.conf b/katie.conf
index 302d0fbb0b1fc4dd7e26d7d8887bef3ab188ab11..e01571cc7466625eb34a0ec2c545035d392f698c 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -337,6 +337,7 @@ Dir
 
 DB
 {
+  Name "projectb";
   Host "ftp-master.debian.org";
   Port -1;
   ROUser "nobody";

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 4ea1ce6e1dbf7af111463763a410038579acb0dc..7c884c777317c189e69256482bd3ad493beac456 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -323,6 +323,7 @@ Dir
 
 DB
 {
+  Name "projectb";
   Host "non-us.debian.org";
   Port -1;
   ROUser "nobody";

diff --git a/madison b/madison
index 882d74bcf7135f674388dc265a2b5341d5cf5844..36c0e9a0a6affe5b12e76b4ce828b19bc46dbfd3 100755 (executable)
--- 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.3 2001-03-02 02:24:33 troup Exp $
+# $Id: madison,v 1.4 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
@@ -50,7 +50,7 @@ def main ():
 
     packages = apt_pkg.ParseCommandLine(Cnf,Arguments,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"]), None, None, Cnf["DB::ROUser"]);
 
     db_access.init(Cnf, projectB);
 

diff --git a/melanie b/melanie
index cad844a6f7de953933963f483c87d4f9f4a4ccd8..378e6df2850989bbde55c7b351617706f7f43d6e 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose archive tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.7 2001-03-02 02:26:17 troup Exp $
+# $Id: melanie,v 1.8 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
@@ -71,7 +71,7 @@ def main ():
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Melanie::Options")
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     # Sanity check options

diff --git a/neve b/neve
index b2a51b99b9c9a127d1d0a301f0694c8f28623d24..7412fc37de4331cd93770a6300cc1bb8e0b15e75 100755 (executable)
--- a/neve
+++ b/neve
@@ -2,7 +2,7 @@
 
 # Populate the DB
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: neve,v 1.2 2001-03-02 02:24:33 troup Exp $
+# $Id: neve,v 1.3 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
@@ -317,7 +317,7 @@ def main ():
         sys.exit(2)
     print output
 
-    projectB = pg.connect('projectb', 'localhost', -1, None, None, 'postgres')
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, 'postgres')
       
     db_access.init (Cnf, projectB);
 

diff --git a/rhona b/rhona
index 9cd6a9a8f1ac0099ecdbf5b6954b1952478ece7f..c080a71ddf087cb67718e55751e988b433cae053 100755 (executable)
--- a/rhona
+++ b/rhona
@@ -2,7 +2,7 @@
 
 # rhona, cleans up unassociated binary and source packages
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: rhona,v 1.12 2001-03-15 22:42:25 troup Exp $
+# $Id: rhona,v 1.13 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
@@ -246,13 +246,13 @@ SELECT m.id FROM maintainer m
 def main():
     global Cnf, projectB, delete_date;
     
-    projectB = pg.connect('projectb', 'localhost');
-
     apt_pkg.init();
     
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
+
     Arguments = [('D',"debug","Rhona::Options::Debug", "IntVal"),
                  ('h',"help","Rhona::Options::Help"),
                  ('n',"no-action","Rhona::Options::No-Action"),

diff --git a/tea b/tea
index fd9b1e003ca4034ba928fa9307129a2800909f9c..9e2b53cda0f6d2f5265dd9b2b8cd8e8370468537 100755 (executable)
--- a/tea
+++ b/tea
@@ -2,7 +2,7 @@
 
 # Sanity check the database
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: tea,v 1.7 2001-03-15 00:35:30 troup Exp $
+# $Id: tea,v 1.8 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
@@ -192,7 +192,7 @@ def main ():
                  ('v',"version","Tea::Options::Version")];
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     check_md5sums();