X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=b17dad0537f5a8ec3fd61511a9831c5ca0aea3ca;hb=791e932971b92146d3621efdd29facc02b109774;hp=bde3776fed0d9d59bdc7ccb9208c640b7c4d4d9b;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git

diff --git a/denise b/denise
index bde3776f..b17dad05 100755
--- a/denise
+++ b/denise
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Output override files for apt-ftparchive and indices/
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: denise,v 1.2 2001-01-16 21:52:37 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: denise,v 1.9 2001-11-18 19:57:58 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
@@ -38,21 +38,18 @@ override = {}
 
 def list(suite, component, type):
     global override;
-    
+
     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));
 
     if not override.has_key(suite):
         override[suite] = {};
@@ -65,29 +62,26 @@ def list(suite, component, type):
         q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, type_id));
         for i in q.getresult():
             override[suite][component][type][i[0]] = i;
-            print string.join(i, '\t');
+            print utils.result_join(i);
     else:
         q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, type_id));
         for i in q.getresult():
             i = i[:-1]; # Strip the priority level
             override[suite][component][type][i[0]] = i;
-            print string.join(i, '\t');
+            print utils.result_join(i);
 
 ################################################################################
 
 def main ():
     global Cnf, projectB, override;
 
-    apt_pkg.init();
-    
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
     Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"),
                  ('h',"help","Denise::Options::Help"),
                  ('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();
@@ -107,7 +101,7 @@ def main ():
                     override_type = ".debian-installer";
                 elif type == "dsc":
                     override_type = ".src";
-                filename = "override.%s.%s%s" % (override_suite, string.replace(component, "non-US/", ""), override_type);
+                filename = "%s/override.%s.%s%s" % (Cnf["Dir::OverrideDir"], override_suite, string.replace(component, "non-US/", ""), override_type);
                 file = utils.open_file(filename, 'w');
                 sys.stdout = file;
                 list(suite, component, type);
@@ -139,15 +133,14 @@ def main ():
             for i in q.getresult():
                 package = i[0];
                 if override["unstable"][component][type].has_key(package):
-                    print string.join(override["unstable"][component][type][package], '\t');
+                    print utils.result_join(override["unstable"][component][type][package]);
                 elif override["stable"][component][type].has_key(package):
-                    print string.join(override["stable"][component][type][package], '\t');
+                    print utils.result_join(override["stable"][component][type][package]);
                 else:
                     if type == "dsc" and (override["unstable"][component]["deb"].has_key(package) or override["stable"][component]["deb"].has_key(package)):
                         continue; # source falls back on binary; so accept silently
-                    sys.stderr.write("W: Can't find override entry for testing package '%s' (component %s, type %s).\n" % (package, component, type));
+                    utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type));
             sys.stdout.close();
-    
 
 #######################################################################################