From d1b80c815c6f838297de84d01fe3675195dc0090 Mon Sep 17 00:00:00 2001 From: James Troup Date: Sat, 27 Nov 2004 16:06:42 +0000 Subject: [PATCH 1/1] 2004-11-27 James Troup * katie.conf (Dinstall::DefaultSuite): add as 'unstable'. (Lauren::MoreInfoURL): update to 3.0r3. (Suite::Stable::Version): likewise. (Suite::Stable::Description): likewise. * cron.daily: disable automatic task override generation.2004-11-27 Daniel Silverstone * katie.conf (Billie::BasicTrees): add all architectures. (Billie::CombinationTrees): remove 'welovehp' and 'embedded', add 'everything'. * cron.daily: Update a 'current' symlink when creating the post-daily-cron-job database backup to aid mirroring to merkel. Run billie. * billie (BillieTarget.poolish_match): handle .udeb too. --- billie | 4 +++- cron.daily | 15 ++++++++++++--- katie.conf | 12 ++++++------ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/billie b/billie index 8346e066..5d9d0035 100755 --- a/billie +++ b/billie @@ -2,7 +2,7 @@ # Prepare and maintain partial trees by architecture # Copyright (C) 2004 Daniel Silverstone -# $Id: billie,v 1.3 2004-07-12 15:44:09 dsilvers Exp $ +# $Id: billie,v 1.4 2004-11-27 16:06:42 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 @@ -65,6 +65,8 @@ class BillieTarget: for a in self.archs: if path.endswith( "_%s.deb" % (a) ): return 1; + if path.endswith( "_%s.udeb" % (a) ): + return 1; if self.source: if (path.endswith( ".tar.gz" ) or path.endswith( ".diff.gz" ) or diff --git a/cron.daily b/cron.daily index f868b740..5cb1cebd 100755 --- a/cron.daily +++ b/cron.daily @@ -57,8 +57,9 @@ cd $overridedir denise # Update task overrides for testing and unstable -cat $extoverridedir/task | perl -ne 'print if /^\S+\sTask\s\S+(,\s*\S+)*$/;' > override.sarge.extra.main -cat $extoverridedir/task | perl -ne 'print if /^\S+\sTask\s\S+(,\s*\S+)*$/;' > override.sid.extra.main +# [JT 2004-02-04 disabled; copying in by hand for now] +#cat $extoverridedir/task | perl -ne 'print if /^\S+\sTask\s\S+(,\s*\S+)*$/;' > override.sarge.extra.main +#cat $extoverridedir/task | perl -ne 'print if /^\S+\sTask\s\S+(,\s*\S+)*$/;' > override.sid.extra.main # FIXME rm -f override.potato.all3 override.sid.all3 @@ -86,7 +87,9 @@ echo Archive maintenance finished at $(date +%X) ################################################################################ echo "Creating post-daily-cron-job backup of projectb database..." -pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S) +POSTDUMP=/org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S) +pg_dump projectb > $POSTDUMP +(cd /org/ftp.debian.org/backup; ln -sf $POSTDUMP current) ################################################################################ @@ -102,6 +105,12 @@ rene | mail -e -s "rene run for $(date +%D)" ftpmaster@ftp-master.debian.org ################################################################################ +# Run billie + +time billie + +################################################################################ + ulimit -m 90000 -d 90000 -s 10000 -v 90000 run-parts --report /org/ftp.debian.org/scripts/distmnt diff --git a/katie.conf b/katie.conf index 79d5087b..02b3e45c 100644 --- a/katie.conf +++ b/katie.conf @@ -23,6 +23,7 @@ Dinstall CloseBugs "true"; OverrideDisparityCheck "true"; StableDislocationSupport "false"; + DefaultSuite "unstable"; AcceptedAutoBuildSuites { unstable; @@ -43,13 +44,12 @@ Billie FTPPath "/org/ftp.debian.org/ftp"; TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots"; TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs"; - BasicTrees { i386; powerpc; }; + BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k }; CombinationTrees { popular { i386; powerpc; all; source; }; - welovehp { hppa; ia64; all; source; }; - embedded { arm; mips; mipsel; source; }; source { source; }; + everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; }; }; }; @@ -101,7 +101,7 @@ Neve Lauren { StableRejector "Martin (Joey) Schulze "; - MoreInfoURL "http://people.debian.org/~joey/3.0r2/"; + MoreInfoURL "http://people.debian.org/~joey/3.0r3/"; }; Emilie @@ -153,9 +153,9 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.0r2"; + Version "3.0r3"; Origin "Debian"; - Description "Debian 3.0r2 Released 20th November 2003"; + Description "Debian 3.0r3 Released 25th October 2004"; CodeName "woody"; OverrideCodeName "woody"; Priority "3"; -- 2.39.2