X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fcron.dinstall;h=4d3bef8fbb6553e72a1229b36c1f61985b8f66a0;hb=077bf03c4495465e28388f52e471877b7afa821a;hp=c2a5b32298345fee2dcd05c10af918fdf97a5b46;hpb=cc8c39a7a9d895a5662c73f225318d74995bec92;p=dak.git

diff --git a/config/backports/cron.dinstall b/config/backports/cron.dinstall
index c2a5b322..4d3bef8f 100755
--- a/config/backports/cron.dinstall
+++ b/config/backports/cron.dinstall
@@ -27,6 +27,7 @@
 
 # exit on errors
 set -e
+set -o pipefail
 # make sure to only use defined variables
 set -u
 # ERR traps should be inherited from functions too. (And command
@@ -179,9 +180,9 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="pgdump_pre"
+    FUNC="pg_timestamp"
     TIME="pg_dump1"
-    ARGS=""
+    ARGS="predinstall"
     ERR=""
 )
 stage $GO
@@ -189,6 +190,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 +232,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 +309,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="mkuploaders"
-    TIME="mkuploaders"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -348,9 +349,17 @@ ts "locked part finished"
 state "postlock"
 
 GO=(
-    FUNC="pgdump_post"
-    TIME="pg_dump2"
+    FUNC="changelogs"
+    TIME="changelogs"
     ARGS=""
+    ERR="false"
+)
+stage $GO &
+
+GO=(
+    FUNC="pg_timestamp"
+    TIME="pg_dump2"
+    ARGS="postdinstall"
     ERR=""
 )
 stage $GO &
@@ -361,7 +370,7 @@ GO=(
     ARGS=""
     ERR=""
 )
-stage $GO &
+#stage $GO &
 
 # GO=(
 #     FUNC="dm"
@@ -390,8 +399,8 @@ stage $GO &
 rm -f "${LOCK_BRITNEY}"
 
 GO=(
-    FUNC="compress"
-    TIME="compress"
+    FUNC="cleantransactions"
+    TIME=""
     ARGS=""
     ERR=""
 )