X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=9261452daec74d7764a1ec4dcfb55719076c07be;hb=b488bb6a14c4376fb533a544d1c24d4ce74a0f5f;hp=4d1195a914768042d5a0274a56a1b6df3f4bffb0;hpb=2d962ea31ca284ac6cdeaa81f1e33d5712134fbd;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 4d1195a9..9261452d 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}"
 
@@ -170,7 +172,7 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="merkel1"
+    FUNC="qa1"
     TIME="init"
     ARGS=""
     ERR="false"
@@ -178,9 +180,9 @@ GO=(
 stage $GO &
 
 GO=(
-    FUNC="pgdump_pre"
+    FUNC="pg_timestamp"
     TIME="pg_dump1"
-    ARGS=""
+    ARGS="predinstall"
     ERR=""
 )
 stage $GO
@@ -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,24 +239,31 @@ 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=""
 )
 stage $GO
 
+GO=(
+    FUNC="filelist"
+    TIME="generate-filelist"
+    ARGS=""
+    ERR=""
+)
+#stage $GO
+
 GO=(
     FUNC="fingerprints"
     TIME="import-keyring"
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -273,6 +281,7 @@ GO=(
 )
 stage $GO
 
+state "packages/contents"
 GO=(
     FUNC="packages"
     TIME="apt-ftparchive"
@@ -281,6 +290,7 @@ GO=(
 )
 stage $GO
 
+state "dists/"
 GO=(
     FUNC="pdiff"
     TIME="pdiff"
@@ -289,6 +299,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="gitpdiff"
+    TIME="gitpdiff"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="release"
     TIME="release files"
@@ -303,20 +321,52 @@ GO=(
     ARGS=""
     ERR=""
 )
-### TODO: clean-* fixup
-#stage $GO
+stage $GO
+
+GO=(
+    FUNC="buildd_dir"
+    TIME="buildd_dir"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+state "scripts"
+GO=(
+    FUNC="mkmaintainers"
+    TIME="mkmaintainers"
+    ARGS=""
+    ERR=""
+)
+stage $GO
 
 GO=(
-    FUNC="buildd"
-    TIME="buildd"
+    FUNC="copyoverrides"
+    TIME="copyoverrides"
     ARGS=""
     ERR=""
 )
 stage $GO
 
 GO=(
-    FUNC="scripts"
-    TIME="scripts"
+    FUNC="mklslar"
+    TIME="mklslar"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mkfilesindices"
+    TIME="mkfilesindices"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
+GO=(
+    FUNC="mkchecksums"
+    TIME="mkchecksums"
     ARGS=""
     ERR=""
 )
@@ -331,44 +381,46 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="wb"
-    TIME="w-b"
+    FUNC="ddaccess"
+    TIME="ddaccessible sync"
     ARGS=""
-    ERR=""
+    ERR="false"
 )
-stage $GO &
+stage $GO
 
-rm -f "${LOCK_DAILY}"
+remove_all_locks
+trap - EXIT TERM HUP INT QUIT
 
 ts "locked part finished"
+state "postlock"
 
 GO=(
-    FUNC="pgdump_post"
-    TIME="pg_dump2"
+    FUNC="changelogs"
+    TIME="changelogs"
     ARGS=""
-    ERR=""
+    ERR="false"
 )
 stage $GO &
 
 GO=(
-    FUNC="expire"
-    TIME="expire_dumps"
-    ARGS=""
+    FUNC="pg_timestamp"
+    TIME="pg_dump2"
+    ARGS="postdinstall"
     ERR=""
 )
-stage $GO &
+stage $GO
 
 GO=(
-    FUNC="transitionsclean"
-    TIME="transitionsclean"
+    FUNC="expire"
+    TIME="expire_dumps"
     ARGS=""
     ERR=""
 )
 stage $GO &
 
 GO=(
-    FUNC="reports"
-    TIME="reports"
+    FUNC="transitionsclean"
+    TIME="transitionsclean"
     ARGS=""
     ERR=""
 )
@@ -390,21 +442,13 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="merkel2"
-    TIME="merkel projectb push"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="mirrorpush"
     TIME="mirrorpush"
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
 GO=(
     FUNC="i18n2"
@@ -412,7 +456,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
 GO=(
     FUNC="stats"
@@ -428,33 +472,17 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
-
-rm -f ${LOCK_BRITNEY}
-
-GO=(
-    FUNC="pgdakdev"
-    TIME="dak-dev db"
-    ARGS=""
-    ERR="false"
-)
 stage $GO &
 
-GO=(
-    FUNC="merkel3"
-    TIME="merkel ddaccessible sync"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
+rm -f "${LOCK_BRITNEY}"
 
 GO=(
-    FUNC="compress"
-    TIME="compress"
+    FUNC="cleantransactions"
+    TIME=""
     ARGS=""
     ERR=""
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="aptftpcleanup"
@@ -462,7 +490,10 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+#stage $GO
+
+# we need to wait for the background processes before the end of dinstall
+wait
 
 log "Daily cron scripts successful, all done"
 
@@ -475,6 +506,7 @@ GO=(
     ERR="false"
 )
 stage $GO
+state "all done"
 
 
 # Now, at the very (successful) end of dinstall, make sure we remove