X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cron.daily-non-US;h=ff68387431572bfddb3bd3710445463c3ea31e15;hb=fa7b68ee3d2c9d467669021fd62e09a407e1244a;hp=770c691413889c4296509114371d26149549e14a;hpb=2e38e1b4845d2404e76bd9bb993a7025a1ed693c;p=dak.git

diff --git a/cron.daily-non-US b/cron.daily-non-US
index 770c6914..ff683874 100755
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -37,9 +37,9 @@ update-readmenonus
 
 ################################################################################
 
-cd $incoming
+cd $accepted
 rm -f REPORT
-katie -pak *.changes | direport | tee REPORT | \
+kelly -pa *.changes | tee REPORT | \
      mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
@@ -49,10 +49,6 @@ symlinks -d -r $ftpdir
 
 cd $masterdir
 jenna
-# FIXME
-cd /org/non-us.debian.org/database/dists/
-rm -f proposed-updates_-_all.list
-for i in proposed-updates_-_binary-* proposed-updates_-_source.list; do cat $i >> proposed-updates_-_all.list; done
 
 # Generate override files
 cd $overridedir
@@ -69,12 +65,20 @@ ziyi
 
 # Clean out old packages
 rhona
+shania
 
+# Generate the Maintainers file
 cd $indices
-charisma > .new-maintainers
+charisma > .new-maintainers_versions
+mv -f .new-maintainers_versions Maintainers_Versions
+sed -e "s/~[^  ]*\([   ]\)/\1/" < Maintainers_Versions | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 mv -f .new-maintainers Maintainers
 gzip -9v <Maintainers >.new-maintainers.gz
 mv -f .new-maintainers.gz Maintainers.gz
+gzip -9v <Maintainers_Versions >.new-maintainers_versions.gz
+mv -f .new-maintainers_versions.gz Maintainers_Versions.gz
+rm -f Maintainers_Versions
+
 cd $masterdir
 copyoverrides
 mklslar
@@ -90,6 +94,15 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ################################################################################
 
+# Vacuum the database
+echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
+
+################################################################################
+
+# Send a report on NEW/BYHAND packages
+helena | mail -e -s "[non-US] NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
+
+################################################################################
 ulimit -m 90000 -d 90000 -s 10000 -v 90000
 
 run-parts --report /org/non-us.debian.org/scripts/distmnt