X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.buildd;h=33f847c35db0fbe4bff26c7c90e6d6fcbc1a6e8e;hb=19ffc1de995fd165d9438a8b7769cd7c45bbce60;hp=970a232263f3e9a8d9307db7ff1c6dccda37bd33;hpb=e13fd3c48245d48b0335649d294aacaee666bab5;p=dak.git

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 970a2322..33f847c3 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -3,12 +3,13 @@
 # Executed after cron.unchecked
 
 set -e
+set -o pipefail
 set -u
 
 export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 SSH_SOCKET=~/.ssh/buildd.debian.org.socket
-DISTS=$(dak admin s list)
+DISTS="stable testing"
 
 if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
     exit 0
@@ -19,8 +20,8 @@ now=$(date +%s)
 check=$(( now - 3*60 ))
 
 for dist in $DISTS; do
-    smodtime=$(stat -c "%Y" $base/buildd/$dist/Sources.gz)
-    pmodtime=$(stat -c "%Y" $base/buildd/$dist/Packages.gz)
+    smodtime=$(stat -c "%Y" $base/build-queues/dists/buildd-$dist/updates/*/source/Sources.gz | sort -n | tail -1)
+    pmodtime=$(stat -c "%Y" $base/build-queues/dists/buildd-$dist/updates/*/binary-*/Packages.gz | sort -n | tail -1)
 
     if [ ${smodtime} -gt ${check} ] || [ ${pmodtime} -gt ${check} ]; then
         # Packages/Sources changed in the last minutes
@@ -40,12 +41,18 @@ if [ ! -z "${dists}" ]; then
     trap 'kill -TERM $SSH_PID' 0
     for d in ${dists}; do
         case ${d} in
-            stable)
+            oldoldstable)
                 send=squeeze
                 ;;
-            testing)
+            oldstable)
                 send=wheezy
                 ;;
+            stable)
+                send=jessie
+                ;;
+            testing)
+                send=stretch
+                ;;
             *)
                 send=unknown
                 ;;