X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall;h=28c7ad1d0a3f7375a0e1aa464f3bd4adccf886e3;hb=f0e560f80a96a2bd79f2a107121e2b88be96926b;hp=0f6a7c8fef7f07c8f9324bfd575c8d9c33d1f9bd;hpb=0576da99da4133a5cc9725fb1c07d69f669cb1e3;p=dak.git diff --git a/config/debian/dinstall b/config/debian/dinstall index 0f6a7c8f..28c7ad1d 100755 --- a/config/debian/dinstall +++ b/config/debian/dinstall @@ -64,6 +64,7 @@ function ts() { # Cleanup actions function cleanup() { savelog -c ${LOGROTATE} -j "$LOGFILE" + rm -f ${LOCK_DAILY} } # Setup the notice file to tell bad mirrors they used the wrong time @@ -223,7 +224,7 @@ function release() { dak generate-releases } -function cleanup() { +function dakcleanup() { log "Cleanup old packages/files" dak clean-suites dak clean-queues @@ -384,7 +385,7 @@ function stage() { # it has to cd first! cd ${configdir} - if [ "${ERR}" = "false"]; then + if [ "${ERR}" = "false" ]; then set +e fi ${FUNC} ${ARGS} @@ -407,7 +408,7 @@ function stage() { # We need logs. LOGFILE="$logdir/dinstall.log" -exec > "$LOGFILE" 2>&1 +exec >> "$LOGFILE" 2>&1 # usually we are not using debug logs. Set to 1 if you want them. DEBUG=0 @@ -478,7 +479,7 @@ GO=( FUNC="updates" TIME="External Updates" ARGS="" - ERR="" + ERR="false" ) stage $GO @@ -583,7 +584,7 @@ GO=( stage $GO GO=( - FUNC="cleanup" + FUNC="dakcleanup" TIME="cleanup" ARGS="" ERR=""