X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=1566cb95466f1730cf453f9c0323915eb00507ef;hb=073b487a41897e27b0e391ebe573cfec739c7030;hp=b3bc7a90c2c26d2431a9f89f41c829839afcd930;hpb=4f0163798cda7f6c83621ecba4f06c712bade6e3;p=dak.git diff --git a/denise b/denise index b3bc7a90..1566cb95 100755 --- a/denise +++ b/denise @@ -2,7 +2,7 @@ # Output override files for apt-ftparchive and indices/ # Copyright (C) 2000, 2001, 2002 James Troup -# $Id: denise,v 1.13 2002-07-30 19:02:06 troup Exp $ +# $Id: denise,v 1.14 2002-10-16 02:47:32 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 @@ -26,8 +26,8 @@ ################################################################################ -import pg, sys, string -import utils, db_access +import pg, sys; +import utils, db_access; import apt_pkg; ################################################################################ @@ -101,7 +101,7 @@ def main (): override_type = ".debian-installer"; elif type == "dsc": override_type = ".src"; - filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, string.replace(component, "non-US/", ""), override_type); + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type); file = utils.open_file(filename, 'w'); list(file, suite, component, type); file.close(); @@ -126,7 +126,7 @@ def main (): override_type = ".src"; elif type == "udeb": continue; - filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, string.replace(component, "non-US/", ""), override_type); + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type); file = utils.open_file(filename, 'w'); for i in q.getresult(): package = i[0];