X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fcommon;h=e796b89c2a7e5646223945840a6bbdfdcacca8ff;hb=f425ea1ef661dd2ac005317fda58413f9ed69848;hp=8aa05a48a0e6a1097ac853244c30ce3d231cbf49;hpb=7a10b5ede63f4f0138de4829cfa23994c8219956;p=dak.git diff --git a/config/debian/common b/config/debian/common index 8aa05a48..e796b89c 100644 --- a/config/debian/common +++ b/config/debian/common @@ -1,3 +1,4 @@ +# -*- mode:sh -*- # log something (basically echo it together with a timestamp) # # Set $PROGRAM to a string to have it added to the output. @@ -26,16 +27,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}" } @@ -49,6 +43,15 @@ function make_buildd_dir () { cp -al ${incoming}/buildd/. tree/${STAMP}/ ln -sfT tree/${STAMP} ${incoming}/builddweb find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf + + for dist in experimental + do + cd ${incoming}/dists/${dist} + mkdir -p tree/${STAMP} + cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/ + ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current + find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf + done } # Do the unchecked processing, in case we have files.