X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=6f7cf0d877b878e4cb2608ae42f096295e2d52f5;hb=e5fa0d1e1c0bcc494b1b9ff2b877b217b8561f2e;hp=2534560e2aef08e212e14ed50bbc0477ee191165;hpb=67b6abb95803ccd67d999f5f0174310776927534;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 2534560e..6f7cf0d8 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -35,7 +35,7 @@ set -u
 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
 
 ########################################################################
@@ -154,10 +154,12 @@ export LC_ALL=C
 
 touch "${DINSTALLSTART}"
 ts "startup"
+DINSTALLBEGIN="$(date -u +"%a %b %d %T %Z %Y (%s)")"
+state "Startup"
 
 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}"
 
@@ -191,40 +193,39 @@ GO=(
     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"
     TIME="p-u-new"
-    ARGS="p-u-new"
-    ERR=""
+    ARGS="proposedupdates"
+    ERR="false"
 )
-### TODO: policy-new
-#stage $GO
+stage $GO
 
 GO=(
     FUNC="opunew"
     TIME="o-p-u-new"
-    ARGS="o-p-u-new"
-    ERR=""
-)
-### TODO: policy-new
-#stage $GO
-
-GO=(
-    FUNC="i18n1"
-    TIME="i18n 1"
-    ARGS=""
+    ARGS="oldproposedupdates"
     ERR="false"
 )
-stage $GO &
-
-lockfile "$LOCK_ACCEPTED"
-lockfile "$LOCK_NEW"
+stage $GO
 
 GO=(
-    FUNC="process_unchecked"
-    TIME="unchecked"
+    FUNC="newstage"
+    TIME="newstage"
     ARGS=""
     ERR=""
 )
@@ -238,12 +239,11 @@ GO=(
 )
 stage $GO
 
-rm -f "$LOCK_ACCEPTED"
-rm -f "$LOCK_NEW"
+state "indices"
 
 GO=(
-    FUNC="msfl"
-    TIME="make-suite-file-list"
+    FUNC="dominate"
+    TIME="dominate"
     ARGS=""
     ERR=""
 )
@@ -263,7 +263,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -281,14 +281,18 @@ GO=(
 )
 stage $GO
 
+state "packages/contents"
 GO=(
     FUNC="packages"
     TIME="apt-ftparchive"
     ARGS=""
     ERR=""
 )
+# Careful: When we ever go and remove this monster-long thing, we have to check the backgrounded
+# functions before it. We no longer have a 1.5hour sync point then.
 stage $GO
 
+state "dists/"
 GO=(
     FUNC="pdiff"
     TIME="pdiff"
@@ -321,33 +325,76 @@ GO=(
 )
 stage $GO
 
+state "scripts"
 GO=(
-    FUNC="scripts"
-    TIME="scripts"
+    FUNC="mkmaintainers"
+    TIME="mkmaintainers"
     ARGS=""
     ERR=""
 )
 stage $GO
 
 GO=(
-    FUNC="mirror"
-    TIME="mirror hardlinks"
+    FUNC="mkuploaders"
+    TIME="mkuploaders"
     ARGS=""
     ERR=""
 )
 stage $GO
 
 GO=(
-    FUNC="wb"
-    TIME="w-b"
+    FUNC="copyoverrides"
+    TIME="copyoverrides"
     ARGS=""
     ERR=""
 )
-stage $GO &
+stage $GO
 
-rm -f "${LOCK_DAILY}"
+GO=(
+    FUNC="mklslar"
+    TIME="mklslar"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mkfilesindices"
+    TIME="mkfilesindices"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mkchecksums"
+    TIME="mkchecksums"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mirror"
+    TIME="mirror hardlinks"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+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"
@@ -373,14 +420,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
 GO=(
     FUNC="dm"
     TIME=""
@@ -411,7 +450,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
 GO=(
     FUNC="i18n2"
@@ -419,7 +458,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
 GO=(
     FUNC="stats"
@@ -435,9 +474,9 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
-rm -f ${LOCK_BRITNEY}
+rm -f "${LOCK_BRITNEY}"
 
 GO=(
     FUNC="pgdakdev"
@@ -471,6 +510,9 @@ GO=(
 )
 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
@@ -482,6 +524,7 @@ GO=(
     ERR="false"
 )
 stage $GO
+state "all done"
 
 
 # Now, at the very (successful) end of dinstall, make sure we remove