From: James Troup Date: Wed, 21 Jan 2004 03:19:52 +0000 (+0000) Subject: 2004-01-21 James Troup * denise (main): generate debian-installe... X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=03042f191d14b9e0c34b3dcd1b17cbca9abb3248;p=dak.git 2004-01-21 James Troup * denise (main): generate debian-installer overrides for testing too. * apt.conf: add support for debian-installer in testing. * katie.conf (Suite::Testing::UdebComponents): set to main. * katie.conf (Dinstall::SigningKeyIds): 2004 key. * katie.conf-non-US (Dinstall::SigningKeyIds): likewise. * katie.conf-security (Dinstall::SigningKeyIds): likewise. --- diff --git a/apt.conf b/apt.conf index 18a91529..f7422d59 100644 --- a/apt.conf +++ b/apt.conf @@ -69,6 +69,20 @@ tree "dists/unstable" Sources::Compress "gzip bzip2"; }; +// debian-installer + +tree "dists/testing/main" +{ + FileList "/org/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list"; + Sections "debian-installer"; + Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; + BinOverride "override.sarge.main.$(SECTION)"; + SrcOverride "override.sarge.main.src"; + BinCacheDB "packages-debian-installer-$(ARCH).db"; + Packages::Extensions ".udeb"; + Contents " "; +}; + tree "dists/unstable/main" { FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list"; @@ -81,6 +95,8 @@ tree "dists/unstable/main" Contents " "; }; +// Experimental + tree "project/experimental" { FileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list"; diff --git a/denise b/denise index 4b0f5847..c525122e 100755 --- a/denise +++ b/denise @@ -1,8 +1,8 @@ #!/usr/bin/env python # Output override files for apt-ftparchive and indices/ -# Copyright (C) 2000, 2001, 2002 James Troup -# $Id: denise,v 1.15 2003-01-02 18:10:02 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2004 James Troup +# $Id: denise,v 1.16 2004-01-21 03:19:52 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 @@ -131,26 +131,36 @@ def main (): continue; component_id = db_access.get_component_id(component); for type in Cnf.ValueList("OverrideType"): - if type == "deb": - override_type = ""; - q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id)); + if type == "deb" or type == "udeb": + if type == "deb": + override_type = ""; + elif type == "udeb": + if component != "main": + continue; + override_type = ".debian-installer"; + q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND b.type = '%s' AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id, type)); elif type == "dsc": q = projectB.query("SELECT DISTINCT s.source FROM src_associations sa, source s, files f, location l WHERE sa.suite = %s AND l.component = %s AND sa.source = s.id AND s.file = f.id AND f.location = l.id" % (suite_id, component_id)); override_type = ".src"; - elif type == "udeb": - continue; 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]; - if override["unstable"][component][type].has_key(package): - file.write(utils.result_join(override["unstable"][component][type][package])+'\n'); - elif override["stable"][component][type].has_key(package): - file.write(utils.result_join(override["stable"][component][type][package])+'\n'); - 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 - utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); + if type == "deb" or type == "dsc": + if override["unstable"][component][type].has_key(package): + file.write(utils.result_join(override["unstable"][component][type][package])+'\n'); + elif override["stable"][component][type].has_key(package): + file.write(utils.result_join(override["stable"][component][type][package])+'\n'); + 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 + utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); + elif type == "udeb": + if component == "main" and override["unstable"][component][type].has_key(package): + file.write(utils.result_join(override["unstable"][component][type][package])+'\n'); + else: + utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); + file.close(); ####################################################################################### diff --git a/katie.conf b/katie.conf index 5f8fd28f..555d12f7 100644 --- a/katie.conf +++ b/katie.conf @@ -4,7 +4,7 @@ Dinstall GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "38C6029A"; + SigningKeyIds "1DB114E0"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -221,6 +221,10 @@ Suite CodeName "sarge"; OverrideCodeName "sarge"; Priority "5"; + UdebComponents + { + main; + }; }; Testing-Proposed-Updates diff --git a/katie.conf-non-US b/katie.conf-non-US index d9beaf68..490e6eec 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -4,7 +4,7 @@ Dinstall GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "30B34DD5"; + SigningKeyIds "1DB114E0"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; diff --git a/katie.conf-security b/katie.conf-security index e3a305e0..c6a156e4 100644 --- a/katie.conf-security +++ b/katie.conf-security @@ -4,7 +4,7 @@ Dinstall GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "30B34DD5"; + SigningKeyIds "1DB114E0"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org";