Merge branch 'master' of /srv/ftp.debian.org/git/dak

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

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 3c34d769ec2bea6d1abccf73910ef2aff5aae791..3105dd69bd5014354e623a92057321f8d7a5a576 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -3,6 +3,7 @@
 # Executed daily via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
@@ -20,10 +21,11 @@ for file in override*.gz; do
 done
 find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
-for suite in $suites; do
+for suite in stable testing; do
     case $suite in
-        stable) override_suite=squeeze;;
-        testing) override_suite=wheezy;;
+        oldstable) override_suite=squeeze;;
+        stable) override_suite=wheezy;;
+        testing) override_suite=jessie;;
         *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -49,7 +51,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in squeeze wheezy; do
+for dist in squeeze wheezy jessie; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then
@@ -78,7 +80,7 @@ if ! lockfile -r100 "$LOCKFILE"; then
 fi
 trap cleanup EXIT
 
-dak clean-queues
+dak clean-queues -i ${unchecked}
 dak clean-queues -i $disembargo
 dak clean-suites