ssh in a while loop really wants -n

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index e06d760b56d98e5d44773f10a95bca1379a46479..bb6f8e4a0b28465dca9031f8e70248a9aa613c7a 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -24,9 +24,9 @@ function debug () {
 }
 
 function wbtrigger() {
-    SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240"
+    SSHOPT="-n -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240"
     if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then
-        ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often
+        ssh -q -q ${SSHOPT} wbadm@buildd /srv/wanna-build/trigger.often
     fi
     rm -f "${LOCK_BUILDD}"
 }
@@ -61,6 +61,7 @@ function punew_do() {
 
     local exportdir="${qdir}/tree/${STAMP}"
     local targetdir="${qdir}/export"
+    mkdir -p -- ${exportdir}
     dak export -q "${queue}" -d "${exportdir}" --all
     ln -sfT ${exportdir} ${targetdir}
     find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
@@ -129,7 +130,7 @@ function sync_debbugs () {
     mkdir -p $queuedir/bts_version_track_archive/${timestamp}
     rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp}
     rmdir --ignore-fail-on-non-empty $queuedir/bts_version_track_archive/${timestamp} # remove if empty.
-    rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
+    rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/srv/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
     NOW=$(date +%s)
     TSTAMP=$(stat -c %Y $lockdir/synced_bts_version)
     DIFF=$(( NOW - TSTAMP ))