set -E
# import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
. $SCRIPTVARS
########################################################################
lockfile -l 3600 "${LOCK_DAILY}"
trap onerror ERR
-trap cleanup EXIT TERM HUP INT QUIT
+trap remove_daily_lock EXIT TERM HUP INT QUIT
touch "${LOCK_BRITNEY}"
ARGS=""
ERR="false"
)
-stage $GO &
+stage $GO
+
+GO=(
+ FUNC="i18n1"
+ TIME="i18n 1"
+ ARGS=""
+ ERR="false"
+)
+stage $GO
+
+lockfile "$LOCK_ACCEPTED"
+lockfile "$LOCK_NEW"
+trap remove_all_locks EXIT TERM HUP INT QUIT
GO=(
FUNC="punew"
stage $GO
GO=(
- FUNC="i18n1"
- TIME="i18n 1"
- ARGS=""
- ERR="false"
-)
-stage $GO &
-
-lockfile "$LOCK_ACCEPTED"
-lockfile "$LOCK_NEW"
-
-GO=(
- FUNC="process_unchecked"
- TIME="unchecked"
+ FUNC="newstage"
+ TIME="newstage"
ARGS=""
ERR=""
)
-# disabled until p-u is faster than now. it runs often enough, so wont hurt to save
-# the time here.
-#stage $GO
+stage $GO
GO=(
FUNC="cruft"
)
stage $GO
-rm -f "$LOCK_ACCEPTED"
-rm -f "$LOCK_NEW"
-
state "indices"
GO=(
ARGS=""
ERR="false"
)
-stage $GO &
+stage $GO
GO=(
FUNC="overrides"
ARGS=""
ERR="false"
)
-stage $GO &
+stage $GO
state "packages/contents"
GO=(
)
stage $GO
+GO=(
+ FUNC="mkuploaders"
+ TIME="mkuploaders"
+ ARGS=""
+ ERR=""
+)
+stage $GO
+
GO=(
FUNC="copyoverrides"
TIME="copyoverrides"
)
stage $GO
-rm -f "${LOCK_DAILY}"
+remove_all_locks
+trap - EXIT TERM HUP INT QUIT
ts "locked part finished"
state "postlock"
+GO=(
+ FUNC="changelogs"
+ TIME="changelogs"
+ ARGS=""
+ ERR="false"
+)
+stage $GO &
+
GO=(
FUNC="pgdump_post"
TIME="pg_dump2"
)
stage $GO &
-GO=(
- FUNC="reports"
- TIME="reports"
- ARGS=""
- ERR=""
-)
-stage $GO &
-
GO=(
FUNC="dm"
TIME=""
)
stage $GO
+# we need to wait for the background processes before the end of dinstall
+wait
+
log "Daily cron scripts successful, all done"
exec > "$logdir/afterdinstall.log" 2>&1