X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=0060d5fd6a8afee6828d01003a547e4148f7505a;hb=e675910657234a246e9cb53e6f989d829afdc5f8;hp=3322a87d58ee4a0bab18711c6e7fb8266c38c97b;hpb=99576eb9184993f1a169c9c2b6cbd5b1caee69af;p=dak.git diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 3322a87d..0060d5fd 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -46,8 +46,7 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars # Timestamp. Used for dinstall stat graphs function ts() { - TS=$(($TS+1)); - echo "Archive maintenance timestamp $TS ($1): $(date +%H:%M:%S)" + echo "Archive maintenance timestamp ($1): $(date +%H:%M:%S)" } # Cleanup actions @@ -437,7 +436,7 @@ function process_unchecked() { # members # - FUNC - the function name to call # - ARGS - Possible arguments to hand to the function. Can be the empty string -# - TS - The timestamp name. Can be the empty string +# - TIME - The timestamp name. Can be the empty string # - ERR - if this is the string false, then the call will be surrounded by # set +e ... set -e calls, so errors in the function do not exit # dinstall. Can be the empty string, meaning true. @@ -461,7 +460,7 @@ function stage() { return fi - debug "Now calling function ${FUNC}. Arguments: ${ARGS}. Timestamp: ${TS}" + debug "Now calling function ${FUNC}. Arguments: ${ARGS}. Timestamp: ${TIME}" # Make sure we are always at the same place. If a function wants to be elsewhere, # it has to cd first! @@ -538,8 +537,6 @@ DINSTALLSTART="${lockdir}/dinstallstart" # Marker for dinstall end DINSTALLEND="${lockdir}/dinstallend" -# Timestamps start at -1. so first gets 0 -TS=-1 touch "${DINSTALLSTART}" ts "startup"