X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cindy;h=367e1e57fe668a566287253e2ab13883baffd069;hb=20ef2ddf06d0c75fd3786fae338ccc3161868f7e;hp=fc80afd50d4eadb6435ef7cd3c47b48025509a82;hpb=faf42c1d777c994b83c27152e1d18c38ce7aa4f0;p=dak.git

diff --git a/cindy b/cindy
index fc80afd5..367e1e57 100755
--- 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.4 2001-06-22 22:53:14 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
@@ -18,6 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+################################################################################
 
 # X-Listening-To: Sanitarium / Master of the Puppets - Metallica
 
@@ -40,18 +41,15 @@ def process(suite, component, type):
     
     suite_id = db_access.get_suite_id(suite);
     if suite_id == -1:
-        sys.stderr.write("Suite '%s' not recognised.\n" % (suite));
-        sys.exit(2);
+        utils.fubar("Suite '%s' not recognised." % (suite));
 
     component_id = db_access.get_component_id(component);
     if component_id == -1:
-        sys.stderr.write("Component '%s' not recognised.\n" % (component));
-        sys.exit(2);
+        utils.fubar("Component '%s' not recognised." % (component));
 
     type_id = db_access.get_override_type_id(type);
     if type_id == -1:
-        sys.stderr.write("Type '%s' not recognised. (Valid types are deb, udeb and dsc.)\n" % (type));
-        sys.exit(2);
+        utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type));
     dsc_type_id = db_access.get_override_type_id("dsc");
 
     if type == "deb" or type == "udeb":
@@ -106,11 +104,11 @@ 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" ]:
-        sys.stderr.write("Processing %s...\n" % (suite));
+        print "Processing %s..." % (suite);
         for component in Cnf.SubTree("Component").List():
             if component == "mixed":
                 continue; # Ick