X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=d66e2348093906cddbee525710896863d2321d36;hb=2f30eb272c2dfbdb3544d7e0a0e120a9e4be3294;hp=61835f79e62aff8060f0e005cc7a7c27dc43d412;hpb=dc672574ad5dc70c44e77be4d740951a9dc02099;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 61835f79..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
 
 ########################################################################
@@ -193,7 +193,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="i18n1"
@@ -201,7 +201,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
@@ -238,9 +238,6 @@ GO=(
 )
 stage $GO
 
-rm -f "$LOCK_ACCEPTED"
-rm -f "$LOCK_NEW"
-
 state "indices"
 
 GO=(
@@ -265,7 +262,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -281,7 +278,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 state "packages/contents"
 GO=(
@@ -384,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"
@@ -413,14 +418,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
 GO=(
     FUNC="dm"
     TIME=""
@@ -511,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