Clearly seperate the various steps of dinstall in the log

[dak.git] / config / debian / cron.dinstall

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index a626c93a6b71443f9816247b9cd9eaebfb488969..4e8c1f2849bc73f1c42e12560710f1f311ed5277 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -74,6 +74,8 @@ function stage() {
     error=${ERR:-"true"}
 
     ARGS=${ARGS:-""}
+
+    log "########## DINSTALL BEGIN: ${FUNC} ${ARGS} ##########"
     STAGEFILE="${stagedir}/${FUNC}_${ARGS}"
     STAGEFILE=${STAGEFILE// /_}
     if [ -f "${STAGEFILE}" ]; then
@@ -132,6 +134,8 @@ function stage() {
     cat "${STAGEFILE}.log" >> "${LOGFILE}"
     rm -f "${STAGEFILE}.log"
 
+    echo "########## DINSTALL END: ${FUNC} ##########"
+
     if [ -f "${LOCK_STOP}" ]; then
         log "${LOCK_STOP} exists, exiting immediately"
         exit 42
@@ -207,7 +211,6 @@ GO=(
 stage $GO
 
 lockfile "$LOCK_ACCEPTED"
-lockfile "$LOCK_NEW"
 trap remove_all_locks EXIT TERM HUP INT QUIT
 
 GO=(
@@ -226,6 +229,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="backports_policy"
+    TIME="backports-policy"
+    ARGS=""
+    ERR="false"
+)
+stage $GO
+
 GO=(
     FUNC="cruft"
     TIME="cruft"
@@ -245,12 +256,12 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="filelist"
-    TIME="generate-filelist"
-    ARGS=""
+    FUNC="autocruft"
+    TIME="autocruft"
+    ARGS="unstable experimental"
     ERR=""
 )
-#stage $GO
+stage $GO
 
 GO=(
     FUNC="fingerprints"
@@ -318,14 +329,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="buildd_dir"
-    TIME="buildd_dir"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 state "scripts"
 GO=(
     FUNC="mkmaintainers"
@@ -445,6 +448,14 @@ GO=(
 )
 stage $GO &
 
+GO=(
+    FUNC="mirrorpush-backports"
+    TIME="mirrorpush-backports"
+    ARGS=""
+    ERR="false"
+)
+stage $GO &
+
 GO=(
     FUNC="i18n2"
     TIME="i18n 2"
@@ -479,14 +490,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="aptftpcleanup"
-    TIME="apt-ftparchive cleanup"
-    ARGS=""
-    ERR="false"
-)
-#stage $GO
-
 # we need to wait for the background processes before the end of dinstall
 wait