X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=5133e1d4a8bbf45ce439f0fb5a1d4efc10a95ca4;hb=e0115df14432cea904226f806269fa83bdc9051e;hp=bde3776fed0d9d59bdc7ccb9208c640b7c4d4d9b;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git diff --git a/denise b/denise index bde3776f..5133e1d4 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 -# $Id: denise,v 1.2 2001-01-16 21:52:37 troup Exp $ +# Copyright (C) 2000, 2001 James Troup +# $Id: denise,v 1.6 2001-06-23 19:16:27 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 @@ -41,18 +41,15 @@ def list(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)); if not override.has_key(suite): override[suite] = {}; @@ -87,7 +84,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(); @@ -107,7 +104,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); @@ -145,7 +142,7 @@ def main (): 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();