X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=19b572d1931f1564329af488e2b014321363bcc5;hb=e5eec88888cc62587888f6f3cdb06cdb10a609e9;hp=40451c8138484b5e6db55b9848909f4753e3645e;hpb=b6cf40a404bec1867ad0e5298ce08857dabb16f9;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 40451c81..19b572d1 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -172,7 +172,7 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="merkel1"
+    FUNC="qa1"
     TIME="init"
     ARGS=""
     ERR="false"
@@ -334,14 +334,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="mkuploaders"
-    TIME="mkuploaders"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -382,6 +374,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="ddaccess"
+    TIME="ddaccessible sync"
+    ARGS=""
+    ERR="false"
+)
+stage $GO
+
 remove_all_locks
 trap - EXIT TERM HUP INT QUIT
 
@@ -436,14 +436,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="merkel2"
-    TIME="merkel projectb push"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="mirrorpush"
     TIME="mirrorpush"
@@ -478,14 +470,6 @@ stage $GO &
 
 rm -f "${LOCK_BRITNEY}"
 
-GO=(
-    FUNC="merkel3"
-    TIME="merkel ddaccessible sync"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="cleantransactions"
     TIME=""
@@ -500,7 +484,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+#stage $GO
 
 # we need to wait for the background processes before the end of dinstall
 wait