import dm keyring on bpo

[dak.git] / config / backports / cron.dinstall

diff --git a/config/backports/cron.dinstall b/config/backports/cron.dinstall
index ab171f43504a95ad9ec4ca5accb6bbb18c3aa77e..c10e3c04a14ed27757e2235595a3c7053f7c5b62 100755 (executable)
--- a/config/backports/cron.dinstall
+++ b/config/backports/cron.dinstall
@@ -179,9 +179,9 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="pgdump_pre"
+    FUNC="pg_timestamp"
     TIME="pg_dump1"
-    ARGS=""
+    ARGS="predinstall"
     ERR=""
 )
 stage $GO
@@ -189,6 +189,14 @@ stage $GO
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
 
+GO=(
+    FUNC="punew"
+    TIME="p-u-new"
+    ARGS="proposedupdates"
+    ERR="false"
+)
+stage $GO
+
 GO=(
     FUNC="newstage"
     TIME="newstage"
@@ -223,13 +231,13 @@ GO=(
 )
 stage $GO
 
-# GO=(
-#     FUNC="fingerprints"
-#     TIME="import-keyring"
-#     ARGS=""
-#     ERR="false"
-# )
-# stage $GO
+GO=(
+    FUNC="fingerprints"
+    TIME="import-keyring"
+    ARGS=""
+    ERR="false"
+)
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -300,14 +308,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="mkuploaders"
-    TIME="mkuploaders"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -348,24 +348,24 @@ 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 &
 
 GO=(
-    FUNC="reports"
-    TIME="reports"
+    FUNC="expire"
+    TIME="expire_dumps"
     ARGS=""
     ERR=""
 )
@@ -398,8 +398,8 @@ stage $GO &
 rm -f "${LOCK_BRITNEY}"
 
 GO=(
-    FUNC="compress"
-    TIME="compress"
+    FUNC="cleantransactions"
+    TIME=""
     ARGS=""
     ERR=""
 )
@@ -413,6 +413,9 @@ 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"
 
 exec > "$logdir/afterdinstall.log" 2>&1