X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=7b1a2f2a7a5aaa8f1bc16082989907bd410d5f47;hb=c4a8947bf81001d2b6ad8f437f5333111dc66d42;hp=cf25522c43c4caccca8c0b1779905bd08f284dae;hpb=24b9f531050a5570750d60c082c4412de9ec9cb1;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index cf25522c..7b1a2f2a 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
 
 ########################################################################
@@ -195,22 +195,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="punew"
-    TIME="p-u-new"
-    ARGS="proposedupdates"
-    ERR="false"
-)
-stage $GO
-
-GO=(
-    FUNC="opunew"
-    TIME="o-p-u-new"
-    ARGS="oldproposedupdates"
-    ERR="false"
-)
-stage $GO
-
 GO=(
     FUNC="i18n1"
     TIME="i18n 1"
@@ -223,14 +207,28 @@ lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
 
 GO=(
-    FUNC="process_unchecked"
-    TIME="unchecked"
+    FUNC="punew"
+    TIME="p-u-new"
+    ARGS="proposedupdates"
+    ERR="false"
+)
+stage $GO
+
+#GO=(
+#    FUNC="opunew"
+#    TIME="o-p-u-new"
+#    ARGS="oldproposedupdates"
+#    ERR="false"
+#)
+#stage $GO
+
+GO=(
+    FUNC="newstage"
+    TIME="newstage"
     ARGS=""
     ERR=""
 )
-# disabled until p-u is faster than now. it runs often enough, so wont hurt to save
-# the time here.
-#stage $GO
+stage $GO
 
 GO=(
     FUNC="cruft"
@@ -338,6 +336,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="mkuploaders"
+    TIME="mkuploaders"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"