X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=d66e2348093906cddbee525710896863d2321d36;hb=3d4f5a474e5550e42c88f30bdc5fd094984dfcc1;hp=e3c6f4e672290c8e07ee96d6354b649ec4d49f0a;hpb=076936ddd05afa6f051db6ec864e3676f2f0f4bc;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index e3c6f4e6..d66e2348 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,6 +154,8 @@ 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
@@ -191,46 +193,42 @@ 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"
 
 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=""
 )
-# 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"
@@ -240,12 +238,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=""
 )
@@ -265,7 +262,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -281,8 +278,9 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
+state "packages/contents"
 GO=(
     FUNC="packages"
     TIME="apt-ftparchive"
@@ -293,6 +291,7 @@ GO=(
 # functions before it. We no longer have a 1.5hour sync point then.
 stage $GO
 
+state "dists/"
 GO=(
     FUNC="pdiff"
     TIME="pdiff"
@@ -325,6 +324,7 @@ GO=(
 )
 stage $GO
 
+state "scripts"
 GO=(
     FUNC="mkmaintainers"
     TIME="mkmaintainers"
@@ -333,6 +333,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="mkuploaders"
+    TIME="mkuploaders"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -373,18 +381,19 @@ GO=(
 )
 stage $GO
 
+remove_locks
+
+ts "locked part finished"
+state "postlock"
+
 GO=(
-    FUNC="wb"
-    TIME="w-b"
+    FUNC="changelogs"
+    TIME="changelogs"
     ARGS=""
-    ERR=""
+    ERR="false"
 )
 stage $GO &
 
-rm -f "${LOCK_DAILY}"
-
-ts "locked part finished"
-
 GO=(
     FUNC="pgdump_post"
     TIME="pg_dump2"
@@ -409,14 +418,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
 GO=(
     FUNC="dm"
     TIME=""
@@ -507,6 +508,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
@@ -518,6 +522,7 @@ GO=(
     ERR="false"
 )
 stage $GO
+state "all done"
 
 
 # Now, at the very (successful) end of dinstall, make sure we remove