w-b-dump/nfu

make the get-w-b-db script work again and move its call to cron.daily

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 0e7f7da4e580ebcff42c4ab5a3dba48e32c4a315..0abaa9408fea12bf2b5d9bd488b3510dae9a987c 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -31,6 +31,10 @@ wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
 chmod go+r ${TMPFILE}
 mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
 
+# Update wanna-build dump
+echo "Update wanna-build database dump"
+$base/dak/scripts/nfu/get-w-b-db
+
 reports
 
 clean_debbugs

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 45677cd97bb854b790a6d1f7cf94f2e9434dd905..1ff6b2cd8c8e4e73cdbb7a2de16b5345643c00da 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -50,10 +50,6 @@ echo "Cleanup apt-ftparchive's database"
 apt-ftparchive -q clean apt.conf
 apt-ftparchive -q clean apt.conf.buildd
 
-# Update wanna-build dump
-echo "Update wanna-build database dump"
-$base/dak/scripts/nfu/get-w-b-db
-
 echo "Fixing symlinks in $ftpdir"
 symlinks -d -r $ftpdir
 

diff --git a/scripts/nfu/get-w-b-db b/scripts/nfu/get-w-b-db
index d525fd23335fe33834c64bdac89dd55daa42e96e..ae8fb1b990a64b22d527c8c60e183dce0d562057 100755 (executable)
--- a/scripts/nfu/get-w-b-db
+++ b/scripts/nfu/get-w-b-db
@@ -1,22 +1,40 @@
 #!/bin/bash
 
+# Copyright (C) 2008 Joachim Breitner <nomeata@debian.org>
+# Copyright (C) 2011 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
+# published by the Free Software Foundation; version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# exit on errors
 set -e
+# make sure to only use defined variables
+set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
-# list of architectures taken from
-# http://buildd.debian.org/stats/
+# import the general variable set.
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
 
 # For debugging, you can override the path using
 # the WB_DB_DIR enviroment variable
-if [ -z "$WB_DB_DIR" ]
-then
-       WB_DB_DIR=/srv/ftp-master.debian.org/scripts/nfu
+if [ -z "$WB_DB_DIR" ]; then
+       WB_DB_DIR=${scriptdir}/nfu
 fi
 
-cd $WB_DB_DIR || { echo "Failed to cd to $WB_DB_DIR" ; exit 1 ;}
-
-for arch in alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
-do
-       rm -f $arch-all.txt
-       echo "Getting $arch-all.txt"
-       wget -q http://buildd.debian.org/stats/$arch-all.txt
+for arch in $(dak admin s-a list-arch unstable); do
+    wget -q http://buildd.debian.org/stats/$arch-all.txt -O ${WB_DB_DIR}/${arch}-all.txt
 done