attempt to deal with files already in the pool

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index 38d95616fb90364db5c7ebe3cfb1fc4131bd17b9..70f92fdd52464718331cc8adceef09fba6ff1538 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -30,18 +30,19 @@ function wbtrigger() {
     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 -o ${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
+            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
     fi
+    rm -f "${LOCK_BUILDD}"
 }
 
 # used by cron.dinstall *and* cron.unchecked.
 function make_buildd_dir () {
-    dak manage-build-queues -v buildd
+    dak manage-build-queues -a
 
     cd ${incoming}
     mkdir -p tree/${STAMP}