X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-non-US;h=6db70ea5f9b29256d2a9277b0e4c9273cd9af2c3;hb=abb6b9019c809b235d5e0f9dfaa543a771fd9ba5;hp=4c0a696681543ed4ed09beb42aabac4d4079134a;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git

diff --git a/cron.daily-non-US b/cron.daily-non-US
index 4c0a6966..6db70ea5 100755
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -33,14 +33,13 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ################################################################################
 
-# temporary hack to work around the lack of an apt-utils & python-apt package
-export PYTHONPATH=$PYTHONPATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/non-us.debian.org/scripts/apt/build/bin/
+update-readmenonus
 
-cd $incoming
+################################################################################
+
+cd $accepted
 rm -f REPORT
-katie -pak *.changes | direport | tee REPORT | \
+katie -pa *.changes | tee REPORT | \
      mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
@@ -50,9 +49,6 @@ symlinks -d -r $ftpdir
 
 cd $masterdir
 jenna
-# FIXME
-cd /org/non-us.debian.org/database/dists/
-for i in proposed-updates_-_binary-*; do cat $i >> proposed-updates_-_binary.list; done
 
 # Generate override files
 cd $overridedir
@@ -64,15 +60,25 @@ for i in main contrib non-free; do cat override.potato.$i >> override.potato.all
 # Generate Packages and Sources files
 cd $masterdir
 apt-ftparchive generate apt.conf-non-US
+# Generate Release files
+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
@@ -88,6 +94,11 @@ 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$"
+
+################################################################################
+
 ulimit -m 90000 -d 90000 -s 10000 -v 90000
 
 run-parts --report /org/non-us.debian.org/scripts/distmnt