update scripts for new world order

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 71840f5a397e5e8f39c5e4152c3a33437b5c39da..ae22c468e54c11d67a1b77ccc879a0ebbe642f96 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -315,8 +315,8 @@ GO=(
 #stage $GO
 
 GO=(
-    FUNC="buildd"
-    TIME="buildd"
+    FUNC="buildd_dir"
+    TIME="buildd_dir"
     ARGS=""
     ERR=""
 )

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 507fc5843ac8089803028c7f964daed859620e82..371671287d21642bd8aefb5703464b4a5402be41 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -59,7 +59,6 @@ cleanup() {
 function do_buildd () {
     if lockfile -r3 $NOTICE; then
         LOCKDAILY="YES"
-        psql projectb -A -t -q -c "SELECT build_queue.path || '/' || build_queue_files.filename FROM build_queue_files LEFT JOIN build_queue ON (build_queue.id = build_queue_files.build_queue_id) WHERE queue_name = 'buildd' AND filename ~ 'd(sc|eb)$';" > $dbdir/dists/unstable_accepted.list
         cd $overridedir
         dak make-overrides &>/dev/null
         rm -f override.sid.all3 override.sid.all3.src

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 57c67c791984f8335a3a2f8309fd48265a7c5147..6857a43698d2bb0bf93f0704fd8f96eea487f924 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -206,15 +206,6 @@ function dakcleanup() {
     dak clean-queues
 }
 
-function buildd() {
-    # Needs to be rebuilt, as files have moved.  Due to unaccepts, we need to
-    # update this before wanna-build is updated.
-    log "Regenerating wanna-build/buildd information"
-    psql projectb -A -t -q -c "SELECT build_queue.path || '/' || build_queue_files.filename FROM build_queue_files LEFT JOIN build_queue ON (build_queue.id =build_queue_files.build_queue_id) WHERE queue_name = 'buildd' AND filename ~ 'd(sc|eb)$'"  > $dbdir/dists/unstable_accepted.list
-    symlinks -d /srv/incoming.debian.org/buildd > /dev/null
-    apt-ftparchive generate apt.conf.buildd
-}
-
 function buildd_dir() {
     # Rebuilt the buildd dir to avoid long times of 403
     log "Regenerating the buildd incoming dir"