Adjust for squeeze.stable

[dak.git] / config / debian-security / cron.daily

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 059de3744529ee0a9e1143c2ec0bbf0af4eb190c..213b0a903ee3043ebe978ca0dbad77e9b025c3e7 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -20,9 +20,9 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-               oldstable) override_suite=etch;;
-               stable) override_suite=lenny;;
-               testing) override_suite=squeeze;;
+               oldstable) override_suite=lenny;;
+               stable) override_suite=squeeze;;
+               testing) override_suite=wheezy;;
                *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -44,7 +44,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in etch lenny squeeze; do
+for dist in lenny squeeze wheezy; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then
@@ -60,11 +60,11 @@ done
 
 ################################################################################
 
-cd $masterdir
+cd $configdir
+dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
 dak clean-queues
+dak clean-queues -i $disembargo
 dak clean-suites
-apt-ftparchive -q clean apt.conf
-apt-ftparchive -q clean apt.conf.buildd
 
 symlinks -d -r $ftpdir
 
@@ -74,4 +74,7 @@ while read dumpname; do
     bzip2 -9fv "$dumpname"
 done
 
+apt-ftparchive -q clean apt.conf
+apt-ftparchive -q clean apt.conf.buildd
+
 ################################################################################