Merge commit 'pkern/new-security-trigger' into merge

* commit 'pkern/new-security-trigger':
  simplify wanna-build update by calling a trigger script

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index 61903eba09b824ef5636434c298379fe174d4db0..a54a2eb1063da758585a89209f7d50851812866a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,13 @@
 
        * web/style.css: Added new stuff from Tincho
 
+2008-12-18  Philipp Kern  <pkern@debian.org>
+
+       * config/debian-security/cron.buildd: simplify wanna-build update
+       by calling a trigger script on the wanna-build host
+       * config/debian-security/cron.daily: no need to refresh
+       packages-arch-specific anymore
+
 2008-12-16  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/cron.dinstall: Run logs.py as last command before

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index d38e093de96c4f47deddcc3c31433fdeb04f4e95..c5bcbb055c7d7230fcaf570be9f650d4e284fce7 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -57,19 +57,7 @@ if [ ! -z "$dists" ]; then
        done
        trap 'kill -TERM $SSH_PID' 0
        for d in $dists; do
-               archs=ARCHS_$d
-               ARCHS=${!archs}
-               cd /org/security.debian.org/buildd/$d
-               if [ "$d" != "oldstable" ]; then
-                       # disabled for oldstable-security by ajt 2008-01-01
-                       for a in $ARCHS; do
-                               quinn-diff -a /org/security.debian.org/buildd/Packages-arch-specific -A $a 2>/dev/null | ssh wbadm@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
-
-                               ssh wbadm@buildd -S $SSH_SOCKET wanna-build -d $d-security -A $a -b $a/build-db --merge-packages < Packages
-                       done
-               else
-                       ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
-               fi
+               ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
        done
 fi
 

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 4e02e57ee903d472454b8e18276b3c0d4d6a7173..8d949781f9816b891695bca67a69ae7fe8d7575b 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -60,11 +60,6 @@ done
 
 ################################################################################
 
-# Freshen Packages-Arch-Specific
-wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/buildd/Packages-arch-specific
-
-################################################################################
-
 cd $masterdir
 dak clean-queues
 dak clean-suites