X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fcron.dinstall;h=c10e3c04a14ed27757e2235595a3c7053f7c5b62;hb=2c0e11e248e13ad7b220b2bdb8020827f79a7e84;hp=0841f8380aab8c51136c709805d952556c30bb23;hpb=99ba94686d0dc810dad10a1f5531d23bd886cf5a;p=dak.git

diff --git a/config/backports/cron.dinstall b/config/backports/cron.dinstall
index 0841f838..c10e3c04 100755
--- a/config/backports/cron.dinstall
+++ b/config/backports/cron.dinstall
@@ -1,7 +1,7 @@
 #!/bin/bash
 # No way I try to deal with a crippled sh just for POSIX foo.
 
-# Copyright (C) 2009 Joerg Jaspert <joerg@debian.org>
+# Copyright (C) 2009, 2010 Joerg Jaspert <joerg@debian.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -35,7 +35,7 @@ set -u
 set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
 . $SCRIPTVARS
 
 ########################################################################
@@ -152,6 +152,13 @@ umask 022
 export LANG=C
 export LC_ALL=C
 
+# If we did not install new packages, we dont want to run.
+if ! [ -f "${DINSTALLPACKAGES}" ]; then
+    log "nothing to do"
+    exit 0
+fi
+rm -f "${DINSTALLPACKAGES}"
+
 touch "${DINSTALLSTART}"
 ts "startup"
 DINSTALLBEGIN="$(date -u +"%a %b %d %T %Z %Y (%s)")"
@@ -172,37 +179,13 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="merkel1"
-    TIME="init"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
-GO=(
-    FUNC="pgdump_pre"
+    FUNC="pg_timestamp"
     TIME="pg_dump1"
-    ARGS=""
+    ARGS="predinstall"
     ERR=""
 )
 stage $GO
 
-GO=(
-    FUNC="updates"
-    TIME="External Updates"
-    ARGS=""
-    ERR="false"
-)
-stage $GO
-
-GO=(
-    FUNC="i18n1"
-    TIME="i18n 1"
-    ARGS=""
-    ERR="false"
-)
-stage $GO
-
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
 
@@ -214,14 +197,6 @@ GO=(
 )
 stage $GO
 
-#GO=(
-#    FUNC="opunew"
-#    TIME="o-p-u-new"
-#    ARGS="oldproposedupdates"
-#    ERR="false"
-#)
-#stage $GO
-
 GO=(
     FUNC="newstage"
     TIME="newstage"
@@ -333,14 +308,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="mkuploaders"
-    TIME="mkuploaders"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -357,14 +324,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="mkfilesindices"
-    TIME="mkfilesindices"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 GO=(
     FUNC="mkchecksums"
     TIME="mkchecksums"
@@ -389,60 +348,36 @@ ts "locked part finished"
 state "postlock"
 
 GO=(
-    FUNC="pgdump_post"
-    TIME="pg_dump2"
+    FUNC="changelogs"
+    TIME="changelogs"
     ARGS=""
-    ERR=""
-)
-stage $GO &
-
-GO=(
-    FUNC="expire"
-    TIME="expire_dumps"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
-GO=(
-    FUNC="transitionsclean"
-    TIME="transitionsclean"
-    ARGS=""
-    ERR=""
+    ERR="false"
 )
 stage $GO &
 
 GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
+    FUNC="pg_timestamp"
+    TIME="pg_dump2"
+    ARGS="postdinstall"
     ERR=""
 )
 stage $GO &
 
 GO=(
-    FUNC="dm"
-    TIME=""
+    FUNC="expire"
+    TIME="expire_dumps"
     ARGS=""
     ERR=""
 )
 stage $GO &
 
-GO=(
-    FUNC="bts"
-    TIME=""
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
-GO=(
-    FUNC="merkel2"
-    TIME="merkel projectb push"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
+# GO=(
+#     FUNC="dm"
+#     TIME=""
+#     ARGS=""
+#     ERR=""
+# )
+# stage $GO &
 
 GO=(
     FUNC="mirrorpush"
@@ -452,14 +387,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="i18n2"
-    TIME="i18n 2"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="stats"
     TIME="stats"
@@ -468,47 +395,26 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="testingsourcelist"
-    TIME=""
-    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 &
-
-GO=(
-    FUNC="compress"
-    TIME="compress"
+    FUNC="cleantransactions"
+    TIME=""
     ARGS=""
     ERR=""
 )
 stage $GO &
 
-GO=(
-    FUNC="aptftpcleanup"
-    TIME="apt-ftparchive cleanup"
-    ARGS=""
-    ERR="false"
-)
-stage $GO
+# GO=(
+#     FUNC="aptftpcleanup"
+#     TIME="apt-ftparchive cleanup"
+#     ARGS=""
+#     ERR="false"
+# )
+# stage $GO
+
+# we need to wait for the background processes before the end of dinstall
+wait
 
 log "Daily cron scripts successful, all done"