Merge commit 'godog/master' into merge

[dak.git] / config / debian / cron.buildd

diff --git a/config/debian/cron.buildd b/config/debian/cron.buildd
index 5e81e765c8fe7312857004808b7af696ffbe550c..a5490e513e7df6bd545e0b25d3b5900b6cc802c4 100755 (executable)
--- a/config/debian/cron.buildd
+++ b/config/debian/cron.buildd
@@ -2,34 +2,5 @@
 #
 # Called from cron.unchecked to update wanna-build, each time it runs.
 #
-ssh buildd@buildd /org/wanna-build/trigger.often
+ssh -q -q -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240 wbadm@buildd /org/wanna-build/trigger.often
 exit 0
-
-cleanup() {
-       rm -f "$LOCKFILE"
-       kill -TERM $SSH_PID
-}
-
-ARCHS="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
-
-set -e
-export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
-. $SCRIPTVARS
-
-LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
-
-if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
-       if lockfile -r3 $LOCKFILE; then
-               trap cleanup 0
-               cd /org/incoming.debian.org/buildd
-               cp /org/wanna-build/tmp/Sources.unstable-old Sources
-               gzip -cd Sources.gz >> Sources
-               for a in $ARCHS; do
-                       cp /org/wanna-build/tmp/Packages.unstable.$a-old Packages
-                       gzip -cd /org/incoming.debian.org/buildd/Packages.gz >> Packages
-                       quinn-diff -i -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -A $a 2>/dev/null | perl -pi -e 's#^(non-free)/.*$##msg' | wanna-build -b $a/build-db --merge-partial-quinn 2> /dev/null
-                       wanna-build -A $a -b $a/build-db --merge-packages Packages 2>/dev/null
-               done
-               rm -f Sources Packages
-       fi
-fi