X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.weekly;h=8f1042dacf581376723d2295820cb378e1ca1276;hb=13b7df7bec375026c6870054f20eb1743470ea19;hp=9a4c56f141f57d466652ca462199d56feb1420f2;hpb=8e475b502ed8cc0696984ac7cb7aad91a0cfca27;p=dak.git

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 9a4c56f1..8f1042da 100755
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -4,7 +4,11 @@
 
 set -e
 set -u
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+# 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
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # Start logging
@@ -32,7 +36,7 @@ echo "Splitting queue/done"
 dak split-done > /dev/null
 
 # Vacuum the database
-echo "VACUUM; VACUUM ANALYZE;" | psql --no-psqlrc projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
+echo "VACUUM; VACUUM ANALYZE;" | psql --no-psqlrc projectb 2>&1
 
 # Do git cleanup stuff
 echo "Doing git stuff"
@@ -50,9 +54,12 @@ apt-ftparchive -q clean apt.conf
 apt-ftparchive -q clean apt.conf.buildd
 
 # Update wanna-build dump
-echo "Update wanan-build database dump"
+echo "Update wanna-build database dump"
 /org/ftp.debian.org/scripts/nfu/get-w-b-db
 
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
+
 echo "Finally, all is done, compressing logfile"
 exec > /dev/null 2>&1