[dak/master] ssh in a while loop really wants -n
---
config/debian/common | 2 +-
config/debian/cron.dinstall | 2 +-
config/debian/dinstall.functions | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/debian/common b/config/debian/common
index ee762f2..bb6f8e4 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -24,7 +24,7 @@ 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 /srv/wanna-build/trigger.often
fi
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index be7413a..09e9c9b 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -224,7 +224,7 @@ while read FUNC ARGS TIME ERR BACKGROUND; do
esac
done < <(cat - <<EOF
savetimestamp none none false false
-qa1 none init false true
+qa1 none init true true
pg_timestamp predinstall pg_dump1 false false
updates none External\ Updates false false
i18n1 none i18n\ 1 false false
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a11c75e..b8a4b0e 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -56,7 +56,7 @@ function onerror() {
# pushing merkels QA user, part one
function qa1() {
log "Telling QA user that we start dinstall"
- ssh -2 -i ~dak/.ssh/push_merkel_qa -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@qa.debian.org sleep 1
+ ssh -n -2 -i ~dak/.ssh/push_merkel_qa -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@qa.debian.org sleep 1
}
# Updating various files
--
2.1.4
Reply to: