config/debian-security/cron.buildd

@@ -14,25 +14,13 @@ if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
     exit 0
 fi
 
-dists=
-now=$(date +%s)
-check=$(( now - 3*60 ))
+last_changed=${1:?}
 
-for dist in $DISTS; do
-    smodtime=$(stat -c "%Y" $base/build-queues/dists/buildd-$dist/updates/*/source/Sources.xz | sort -n | tail -1)
-    pmodtime=$(stat -c "%Y" $base/build-queues/dists/buildd-$dist/updates/*/binary-*/Packages.xz | sort -n | tail -1)
-
-    if [ ${smodtime} -gt ${check} ] || [ ${pmodtime} -gt ${check} ]; then
-        # Packages/Sources changed in the last minutes
-        dists="${dists} ${dist}"
-    else
-        continue
-    fi
-done
+trigger_wb() {
+    local dist="${1:?}"
+    local send=
 
-if [ ! -z "${dists}" ]; then
-    for d in ${dists}; do
-        case ${d} in
+    case "${dist}" in
         oldoldstable)
             send=jessie
             ;;
@@ -43,7 +31,7 @@ if [ ! -z "${dists}" ]; then
             send=buster
             ;;
         testing-security)
-                send=bullseye-security
+            send=bullseye
             ;;
         *)
             send=unknown
@@ -51,5 +39,11 @@ if [ ! -z "${dists}" ]; then
     esac
 
     ssh -n wbadm@buildd trigger.security $send
-    done
+}
+
+for dist in $DISTS; do
+    dist_changed=$(psql -qAtc "SELECT last_changed > '${last_changed}' FROM suite WHERE suite_name = '${dist}'")
+    if [[ "${dist_changed}" = "t" ]]; then
+        trigger_wb ${dist}
     fi
+done

config/debian-security/unchecked.functions

@@ -4,7 +4,7 @@ function sync_accepted() {
 }
 
 function trigger_wb_security() {
-    ${configdir}/cron.buildd
+    ${configdir}/cron.buildd ${LAST_CHANGED}
 }
 
 function clean_suites() {

config/debian/common

@@ -97,7 +97,6 @@ function make_buildd_dir () {
 
     if [[ $archive = security ]]; then
         ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-security-buildd
-        $configdir/cron.buildd
         sudo -u archvsync runmirrors -a security-buildd-pool
     else
         # Stick a last modified date in the page footer