From: Mark Hymers Date: Wed, 4 Nov 2009 19:11:03 +0000 (+0000) Subject: update scripts for new world order X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c20056f57077ece45513e0f0d404728f8deeb54;p=dak update scripts for new world order Signed-off-by: Mark Hymers --- diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 71840f5a..ae22c468 100755 --- 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 507fc584..37167128 100755 --- 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 57c67c79..6857a436 100644 --- 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"