From: James Troup Date: Wed, 29 May 2002 18:05:55 +0000 (+0000) Subject: sync X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ee27e62fd7f3a3316fd69b68e7a7df133a113f8;p=dak sync --- diff --git a/apt.conf.buildd b/apt.conf.buildd index ddf92245..0cc3eff0 100644 --- a/apt.conf.buildd +++ b/apt.conf.buildd @@ -20,8 +20,6 @@ bindirectory "incoming" Sources "Sources"; Contents " "; - FileList "/org/ftp.debian.org/database/dists/unstable_accepted.list"; - BinOverride "override.sid.all3"; BinCacheDB "packages-accepted.db"; PathPrefix ""; diff --git a/cron.buildd b/cron.buildd index 89f86f27..785fad93 100644 --- a/cron.buildd +++ b/cron.buildd @@ -10,11 +10,10 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then cd $overridedir - denise + denise &>/dev/null rm -f override.sid.all3 for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done cd $masterdir - cameron apt-ftparchive -qq generate apt.conf.buildd cd /org/incoming.debian.org/buildd for a in $ARCHS; do diff --git a/katie.conf b/katie.conf index fca9ece5..07731a21 100644 --- a/katie.conf +++ b/katie.conf @@ -329,9 +329,11 @@ Suite SuiteMappings { "map stable proposed-updates"; + "map stable-security proposed-updates"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing woody-proposed-updates"; + "map testing-security woody-proposed-updates"; "map-unreleased testing unstable"; "map-unreleased woody-proposed-updates unstable"; }; diff --git a/katie.conf-non-US b/katie.conf-non-US index 2d16907f..5c1aff2a 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -279,9 +279,11 @@ Suite SuiteMappings { "map stable proposed-updates"; + "map stable-security proposed-updates"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing woody-proposed-updates"; + "map testing-security woody-proposed-updates"; "map-unreleased testing unstable-"; "map-unreleased woody-proposed-updates unstable"; }; diff --git a/katie.conf-security b/katie.conf-security index 7f644404..7a24b106 100644 --- a/katie.conf-security +++ b/katie.conf-security @@ -162,8 +162,8 @@ Suite SuiteMappings { - "map stable-sec potato"; - "map testing-sec woody"; + "map stable-security potato"; + "map testing-security woody"; }; Dir @@ -179,6 +179,7 @@ Dir Morgue "/org/security.debian.org/morgue/"; MorgueReject "reject"; Override "/org/security.debian.org/scripts/override/"; + AcceptedAutoBuild "/org/security.debian.org/buildd/"; Queue { Root "/org/security.debian.org/queue/"; @@ -189,7 +190,6 @@ Dir New "/org/security.debian.org/queue/new/"; Reject "/org/security.debian.org/queue/reject/"; Unchecked "/org/security.debian.org/queue/unchecked/"; - AcceptedAutoBuild "/org/security.debian.org/buildd/"; }; };