format_timedelta() {
local secs="$1"; shift
if [ "$secs" -ge 86400 ]; then
- printf '%dd %02d:%02d:%02d\n' $(($secs/3600/24)) $(($secs/3600%24)) $(($secs/60%60)) $(($secs%60))
+ printf '%d+%02d:%02d:%02d\n' $(($secs/3600/24)) $(($secs/3600%24)) $(($secs/60%60)) $(($secs%60))
else
printf '%02d:%02d:%02d\n' $(($secs/3600)) $(($secs/60%60)) $(($secs%60))
fi
flagfilesuccess="$STATEDIR/$host-$port.last-success"
if [ -n "$forcehostport" ]; then
if [ "$forcehostport" != "$host:$port" ]; then
- log "Skipping $host:$port $version/$cluster because this run is limited to $host:$port."
+ log "Skipping $host:$port $version/$cluster because this run is limited to $forcehostport."
runme=0
else
log "Forcing $host:$port $version/$cluster run."
age_after_min=$((delta - MIN_WAIT_SUCCESS))
if [ "$age_after_min" -lt "$rnd_cuttoff" ]; then
runme=0
- log "Skipping $host:$port $version/$cluster because random computer says wait ($age_after_min < $rnd_cuttoff)."
+ log "Skipping $host:$port $version/$cluster because random computer says wait ([$(format_timedelta "${age_after_min}") < $(format_timedelta "${rnd_cuttoff}") (< $(format_timedelta "${DELTA_WAIT_SUCCESS}"))] + $(format_timedelta "${MIN_WAIT_SUCCESS}"))."
else
runme=1
- log "Planning to run $host:$port $version/$cluster because random computer says so ($age_after_min >= $rnd_cuttoff)."
+ log "Planning to run $host:$port $version/$cluster because random computer says so ($(format_timedelta "${age_after_min}") >= $(format_timedelta "${rnd_cuttoff}"))."
fi
fi
fi
bmdb1.debian.org 5436 debian-backup wannabuild 9.6
bmdb1.debian.org 5440 debian-backup debsources 9.6
fasolo.debian.org 5433 debian-backup dak 9.6
-sibelius.debian.org 5433 debian-backup snapshot 9.4
-<%- if @hostname != "backuphost" -%>
-moszumanska.debian.org 5432 debian-backup main 9.1
-<%- end -%>
+sallinen.debian.org 5473 debian-backup snapshot 9.6
#
# puppet notice: this is just a partial file. The tail EOF comes
# from a different concat fragment