X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=d275354cc2daf6f7505906a9d628bb2a1b5c8140;hb=a230888892aa3638bd2f51446a788659c182c2eb;hp=7c763defb90a702e76b63aa60332385ad5347342;hpb=ad199e263b2538ddd32a6cb93284bb00eb959f51;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 7c763def..d275354c 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
 
 ########################################################################
@@ -193,25 +193,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
-
-GO=(
-    FUNC="punew"
-    TIME="p-u-new"
-    ARGS="p-u-new"
-    ERR=""
-)
-### TODO: policy-new
-#stage $GO
-
-GO=(
-    FUNC="opunew"
-    TIME="o-p-u-new"
-    ARGS="o-p-u-new"
-    ERR=""
-)
-### TODO: policy-new
-#stage $GO
+stage $GO
 
 GO=(
     FUNC="i18n1"
@@ -219,20 +201,34 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
 
 GO=(
-    FUNC="process_unchecked"
-    TIME="unchecked"
+    FUNC="punew"
+    TIME="p-u-new"
+    ARGS="proposedupdates"
+    ERR="false"
+)
+stage $GO
+
+#GO=(
+#    FUNC="opunew"
+#    TIME="o-p-u-new"
+#    ARGS="oldproposedupdates"
+#    ERR="false"
+#)
+#stage $GO
+
+GO=(
+    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"
@@ -242,9 +238,6 @@ GO=(
 )
 stage $GO
 
-rm -f "$LOCK_ACCEPTED"
-rm -f "$LOCK_NEW"
-
 state "indices"
 
 GO=(
@@ -269,7 +262,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -285,7 +278,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 state "packages/contents"
 GO=(
@@ -340,6 +333,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="mkuploaders"
+    TIME="mkuploaders"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -380,11 +381,19 @@ GO=(
 )
 stage $GO
 
-rm -f "${LOCK_DAILY}"
+remove_locks
 
 ts "locked part finished"
 state "postlock"
 
+GO=(
+    FUNC="changelogs"
+    TIME="changelogs"
+    ARGS=""
+    ERR="false"
+)
+stage $GO &
+
 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