From: Joerg Jaspert Date: Sun, 20 Dec 2009 20:30:40 +0000 (+0100) Subject: remove wb X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=5631c321aad9d3275f125bd762dac8ea31a25a6f;p=dak.git remove wb remove the wb daily push stuff. Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/common b/config/debian/common index 212d84ad..43bd1bd0 100644 --- a/config/debian/common +++ b/config/debian/common @@ -26,16 +26,9 @@ function debug () { } function wbtrigger() { - MODE=${1:-"often"} SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then - if [ "x${MODE}x" = "xdailyx" ]; then - ssh ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.daily || echo "W-B trigger.daily failed" | mail -s "W-B Daily trigger failed" ftpmaster@ftp-master.debian.org - elif [ "x${MODE}x" = "xoftenx" ]; then - ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often - else - log_error "Unknown wb trigger mode called" - fi + ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often fi rm -f "${LOCK_BUILDD}" } diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked index a9e59f2f..fbc2a5ef 100755 --- a/config/debian/cron.unchecked +++ b/config/debian/cron.unchecked @@ -70,7 +70,7 @@ function do_buildd () { fi done make_buildd_dir - wbtrigger "often" + wbtrigger fi } diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 19d62ed0..e921563a 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -392,11 +392,6 @@ function mirror() { rsync -aH --link-dest ${ftpdir} --delete --delete-after --ignore-errors ${ftpdir}/. . } -function wb() { - log "Trigger daily wanna-build run" - wbtrigger "daily" -} - function expire() { log "Expiring old database dumps..." cd $base/backup